diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-02-13 19:32:37 +0800 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2018-04-17 14:13:19 -0700 |
commit | fe45bbfe7cc85c88e0d190b3e9dcdf46d089df28 (patch) | |
tree | d1827b5d8eaa2ce5889f8170f6d6f8f8b2a22dc6 /conf | |
parent | 7e284b95b45c7ec5c5b5c8cb08122d3b470c0d63 (diff) | |
download | meta-intel-fe45bbfe7cc85c88e0d190b3e9dcdf46d089df28.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>
(cherry picked from commit c71d3ab21655c6a3754c6a02ac603ac2a683d1c9)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/intel-core2-32.conf | 1 | ||||
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 1 |
2 files changed, 0 insertions, 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" | |||
32 | 32 | ||
33 | IMAGE_FSTYPES += "wic" | 33 | IMAGE_FSTYPES += "wic" |
34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" | 34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" |
35 | 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" | |||
43 | 43 | ||
44 | IMAGE_FSTYPES += "wic" | 44 | IMAGE_FSTYPES += "wic" |
45 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" | 45 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" |
46 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | ||