summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-02-13 11:32:38 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-16 23:44:01 (GMT)
commitab858eb989071f10f6a3796b200c6c61d42ee082 (patch)
tree6c351356ac67ebe573c2905ce00ccef56df4a843
parentc71d3ab21655c6a3754c6a02ac603ac2a683d1c9 (diff)
downloadmeta-intel-ab858eb989071f10f6a3796b200c6c61d42ee082.tar.gz
conf: override WKS_FILE_DEPENDS for intel machines
WKS_FILE_DEPENDS includes all the dependencies for producing wic images and is meant to be overridden with correct set by image recipes. Right now, the default values result in grub-efi being built even when EFI_PROVIDER is set to systemd-boot. Change the value to depend only on the EFI_PROVIDER bootloader. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r--conf/machine/intel-core2-32.conf1
-rw-r--r--conf/machine/intel-corei7-64.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index aa8a579..c48023c 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -32,3 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
32 32
33IMAGE_FSTYPES += "wic" 33IMAGE_FSTYPES += "wic"
34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
35WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 78c52ee..c4ce335 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -42,3 +42,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0"
42 42
43IMAGE_FSTYPES += "wic" 43IMAGE_FSTYPES += "wic"
44WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 44WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
45WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}"