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

California Sullivan california.l.sullivan at intel.com
Tue Apr 17 17:21:31 PDT 2018


From: Anuj Mittal <anuj.mittal at intel.com>

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 <anuj.mittal at intel.com>
Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
(cherry picked from commit c71d3ab21655c6a3754c6a02ac603ac2a683d1c9)
Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 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 abe6f901..aa8a5793 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 78a1f6e9..47ad16d9 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -43,4 +43,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.14.3



More information about the meta-intel mailing list