Overriding systemd-bootdisk.wks unconditionally was against Yocto Project's compatibility requirements, so our version needed to be renamed.
Change our conf files to use the renamed version. Signed-off-by: California Sullivan <california.l.sulli...@intel.com> --- Note: Depends on Saul's renaming patch. Merge that first. conf/machine/intel-core2-32.conf | 2 +- conf/machine/intel-corei7-64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index f7ca3e6..d0855d6 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -34,6 +34,6 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "systemd-bootdisk.wks" +WKS_FILE ?= "systemd-bootdisk-uuid.wks" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index d28fdbf..9846795 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -33,6 +33,6 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "systemd-bootdisk.wks" +WKS_FILE ?= "systemd-bootdisk-uuid.wks" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" -- 2.5.5 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel