diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2017-05-12 17:36:27 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-05-16 08:05:07 -0700 |
commit | 7169c2a5008bd57d68f62340c602449c5dbe7667 (patch) | |
tree | f410ba822b4aaef281b1ec55c259750f477c3048 /conf/machine/intel-core2-32.conf | |
parent | c339fa115a441a5d0d487457ae776a4f7a2fc505 (diff) | |
download | meta-intel-7169c2a5008bd57d68f62340c602449c5dbe7667.tar.gz |
conf/machine/intel-core*: change WKS_FILE based on EFI_PROVIDER
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@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'conf/machine/intel-core2-32.conf')
-rw-r--r-- | conf/machine/intel-core2-32.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index a08ce896..91b705fb 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" | |||
33 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" | 33 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" |
34 | 34 | ||
35 | IMAGE_FSTYPES += "wic" | 35 | IMAGE_FSTYPES += "wic" |
36 | WKS_FILE ?= "systemd-bootdisk.wks" | 36 | WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" |
37 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 37 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |