[meta-intel] [PATCH] conf/machine/intel-core*: change WKS_FILE based on EFI_PROVIDER

[California Sullivan]

If someone changes their EFI_PROVIDER to grub-efi, we shouldn't be
building a systemd-boot based wic image. Use bb.utils.contains to
be default to mkefidisk.wks if we aren't using a systemd-boot based
EFI_PROVIDER.

mkefidisk.wks is the same as systemd-bootdisk.wks, except it uses grub
and sets rootwait on the kernel command line, so its nearly equivalent.

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
Note: won't apply without patch "canned-wks/systemd-bootdisk-uuid.wks:
remove file".
I should have sent them as a series but I didn't think of doing this
until I had already sent the previous patch.
 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 a08ce89..91b705f 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 ?= "systemd-bootdisk.wks"
+WKS_FILE ?= "${@bb.utils.contains("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 cca45c7..f28478f 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 ?= "systemd-bootdisk.wks"
+WKS_FILE ?= "${@bb.utils.contains("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