aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMikko Ylinen <mikko.ylinen@linux.intel.com>2017-01-12 15:55:56 +0200
committerCalifornia Sullivan <california.l.sullivan@intel.com>2017-01-17 10:03:26 -0800
commit85c16a907fd8eb8aafbd17769f368389276eb5bb (patch)
tree164b728aa1f56f60c77d8952c98ac8376d6c38bc /conf
parenta7941f79f61d9bb3d946b67c619380e0c88cd9fb (diff)
downloadmeta-intel-85c16a907fd8eb8aafbd17769f368389276eb5bb.tar.gz
meta-intel-85c16a907fd8eb8aafbd17769f368389276eb5bb.tar.bz2
meta-intel-85c16a907fd8eb8aafbd17769f368389276eb5bb.zip
intel-*: wic: drop recursive task depedency to do_bootimg
do_image_wic (in image_types.bbclass) deals with the task dependency to do_bootimg if live images are built. It's redundant to set do_bootimg as a recrdeptask in the machine configurations so remove it. Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/intel-core2-32.conf1
-rw-r--r--conf/machine/intel-corei7-64.conf1
-rw-r--r--conf/machine/intel-quark.conf2
3 files changed, 0 insertions, 4 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index af2e70ed..c5cfb9c0 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -37,4 +37,3 @@ PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
IMAGE_FSTYPES += "wic"
WKS_FILE ?= "systemd-bootdisk-uuid.wks"
do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-do_image_wic[recrdeptask] += "do_bootimg"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index eacca776..43e7c1ab 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -36,4 +36,3 @@ PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
IMAGE_FSTYPES += "wic"
WKS_FILE ?= "systemd-bootdisk-uuid.wks"
do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-do_image_wic[recrdeptask] += "do_bootimg"
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf
index b615055f..28a1687b 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -35,5 +35,3 @@ KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes"
IMAGE_FSTYPES += "wic"
WKS_FILE ?= "galileodisk-sd.wks"
do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-do_image_wic[recrdeptask] += "do_bootimg"
-