From ab858eb989071f10f6a3796b200c6c61d42ee082 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 13 Feb 2018 19:32:38 +0800 Subject: 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 Signed-off-by: California Sullivan --- conf/machine/intel-core2-32.conf | 1 + conf/machine/intel-corei7-64.conf | 1 + 2 files changed, 2 insertions(+) (limited to 'conf/machine') diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index aa8a5793..c48023cc 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" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" +WKS_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 78c52eed..c4ce3359 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" IMAGE_FSTYPES += "wic" WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" +WKS_FILE_DEPENDS ?= "${WKS_FILE_DEPENDS_DEFAULT} syslinux ${EFI_PROVIDER}" -- cgit v1.2.3-54-g00ecf