summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-05-13 00:36:27 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-05-16 15:05:07 (GMT)
commit7169c2a5008bd57d68f62340c602449c5dbe7667 (patch)
treef410ba822b4aaef281b1ec55c259750f477c3048
parentc339fa115a441a5d0d487457ae776a4f7a2fc505 (diff)
downloadmeta-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>
-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 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"
33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
34 34
35IMAGE_FSTYPES += "wic" 35IMAGE_FSTYPES += "wic"
36WKS_FILE ?= "systemd-bootdisk.wks" 36WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 37do_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"
34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
35 35
36IMAGE_FSTYPES += "wic" 36IMAGE_FSTYPES += "wic"
37WKS_FILE ?= "systemd-bootdisk.wks" 37WKS_FILE ?= "${@bb.utils.contains("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"