[meta-intel] [PATCH 2/2] conf: override WKS_FILE_DEPENDS for intel machines

[Anuj Mittal]

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 
---
 conf/machine/intel-core2-32.conf  | 1 +
 conf/machine/intel-corei7-64.conf | 1 +
 2 files changed, 2 insertions(+)

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"
 
 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 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"
 
 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}"
-- 
2.7.4

-- 
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel

[meta-intel] [PATCH 1/2] conf/machine/intel-*: remove do_image_wic depends

[Anuj Mittal]

These dependencies on native tools needed by wic images have already been
added by image_types_wic bbclass. Appending here results in same dependencies
being added twice.

Signed-off-by: Anuj Mittal 
---
 conf/machine/intel-core2-32.conf  | 1 -
 conf/machine/intel-corei7-64.conf | 1 -
 2 files changed, 2 deletions(-)

diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index abe6f90..aa8a579 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -32,4 +32,3 @@ 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)}"
-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 8b36b36..78c52ee 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -42,4 +42,3 @@ 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)}"
-do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot 
mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-- 
2.7.4

-- 
___
meta-intel mailing list
meta-intel@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-intel