From 85c16a907fd8eb8aafbd17769f368389276eb5bb Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 12 Jan 2017 15:55:56 +0200 Subject: 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 Signed-off-by: California Sullivan --- conf/machine/intel-core2-32.conf | 1 - conf/machine/intel-corei7-64.conf | 1 - conf/machine/intel-quark.conf | 2 -- 3 files changed, 4 deletions(-) (limited to 'conf') 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" - -- cgit v1.2.3-54-g00ecf