aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-12-30 14:59:29 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-31 11:17:06 +0000
commit4b93115a0c6f8686e7a21b992751626844c301d5 (patch)
tree8431191ec27e85073645b075b879663e767267d3
parentbb6a99f933795a9218051f1cd47c5551352d861c (diff)
downloadopenembedded-core-contrib-4b93115a0c6f8686e7a21b992751626844c301d5.tar.gz
openembedded-core-contrib-4b93115a0c6f8686e7a21b992751626844c301d5.tar.bz2
openembedded-core-contrib-4b93115a0c6f8686e7a21b992751626844c301d5.zip
classes/image_types_wic: Depend on do_image_complete tasks
do_image_wic now depends on the do_image_complete tasks from all it's dependencies. This allows images recipes specified in WKS_FILE_DEPENDS (for example, if a machine wants to put a initrd into a boot partition) to correctly trigger rebuilds for the wic image. Note that recrdeptask can't be used as was done for do_deploy because this would cause circular task dependency errors. This shouldn't be necessary anyway if the dependencies specified in WKS_FILE_DEPENDS are complete. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types_wic.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index f350dc2723f..7d5ebe1cb00 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -46,6 +46,7 @@ do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r
# We ensure all artfacts are deployed (e.g virtual/bootloader)
do_image_wic[recrdeptask] += "do_deploy"
+do_image_wic[deptask] += "do_image_complete"
WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}'
WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native"