diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-12-30 14:59:29 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-01 10:46:16 +0000 |
commit | 4ceb3fcb4e140a12b2b2decdca6f012fa8682f5c (patch) | |
tree | ad8efa6c81f9dd352bc8097ea005d5dc18682052 /meta/classes | |
parent | 9ac05adcdd737e92f699690c7d6ac230f62d751a (diff) | |
download | poky-4ceb3fcb4e140a12b2b2decdca6f012fa8682f5c.tar.gz |
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.
(From OE-Core rev: 4b93115a0c6f8686e7a21b992751626844c301d5)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index f350dc2723..7d5ebe1cb0 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 | |||
46 | 46 | ||
47 | # We ensure all artfacts are deployed (e.g virtual/bootloader) | 47 | # We ensure all artfacts are deployed (e.g virtual/bootloader) |
48 | do_image_wic[recrdeptask] += "do_deploy" | 48 | do_image_wic[recrdeptask] += "do_deploy" |
49 | do_image_wic[deptask] += "do_image_complete" | ||
49 | 50 | ||
50 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 51 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
51 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | 52 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" |