Skip to contentSkip to conversation

classes/image_types_wic: Depend on do_image_complete tasks

PATCH New Joshua Watt 1 participant 1 message Dec 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/image_types_wic.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/image_types_wic.bbclass +1 -0
index f350dc2723..7d5ebe1cb0 100644
@@ -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"
Signature · 1 line
2.23.0