aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-05-19 11:01:20 -0700
committerSaul Wold <sgw@linux.intel.com>2017-05-19 11:21:47 -0700
commit7e8f98aa326f16edd679a95f7bb2daf4256479f3 (patch)
tree1a78775950a101b6ad5bc2ff5916445fab0fddc0
parent5fe286fd7cf0c0692c55c75a5ad7ac4a058e9c25 (diff)
downloadmeta-intel-7.0-pyro-2.3.tar.gz
meta-intel-7.0-pyro-2.3.tar.bz2
meta-intel-7.0-pyro-2.3.zip
conf/machine/intel-core*: Fix WKS_FILE setting7.0-pyro-2.3
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.sullivan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 91b705fb..bc2c7640 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 f28478f7..d88be2db 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"