summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-02-13 11:32:37 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-02-16 23:44:01 (GMT)
commitc71d3ab21655c6a3754c6a02ac603ac2a683d1c9 (patch)
tree30ec81fc282eb9c53beffcd20bfcf58b5c6443ff
parentb76785739c91ba2291091c82895184b4445d68af (diff)
downloadmeta-intel-c71d3ab21655c6a3754c6a02ac603ac2a683d1c9.tar.gz
conf/machine/intel-*: remove do_image_wic depends
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@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, 0 insertions, 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"
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)}"
35do_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"
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)}"
45do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"