[oe-commits] [openembedded-core] 04/07: classes/image_types_wic: Depend on do_image_complete tasks

git at git.openembedded.org git at git.openembedded.org
Tue Dec 31 11:20:34 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 4b93115a0c6f8686e7a21b992751626844c301d5
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Mon Dec 30 14:59:29 2019 -0600

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/image_types_wic.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index f350dc2..7d5ebe1 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list