bb.utils.contains checks if ALL items are in the variable, and since we check for systemd-boot or rmc-boot, it would always be false, assigning mkefidisk as the WKS_FILE in all cases. bb.utils.contains_any checks if one or more items are in the variable, so use that instead.
Signed-off-by: California Sullivan <california.l.sulli...@intel.com> --- 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 91b705f..bc2c764 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -33,5 +33,5 @@ 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 ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" +WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index f28478f..d88be2d 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -34,5 +34,5 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" +WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- 2.5.5 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel