[oe-commits] [openembedded-core] 17/20: classes/image: move image_qa to between rootfs and image

[git at git.openembedded.org]

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

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

commit 62ce334e583ecdf1f93619f4131c0fa5d88d5b02
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Sep 19 17:20:37 2017 +0100

    classes/image: move image_qa to between rootfs and image
    
    It was noticed that do_image_qa is useless when rm_work is enabled as the rootfs
    directory is deleted before image_qa is called.
    
    This indicates that image_qa is incorrectly scheduled as it failing should mean
    images don't get generated, so move it between do_rootfs and do_image.
    
    Also, add a little bit more documentation to the comments.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 3639aa4..4850eed 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -297,8 +297,11 @@ addtask do_image_complete_setscene
 # IMAGE_QA_COMMANDS += " \
 #     image_check_everything_ok \
 # "
-# This task runs all functions in IMAGE_QA_COMMANDS after the image
+# This task runs all functions in IMAGE_QA_COMMANDS after the rootfs
 # construction has completed in order to validate the resulting image.
+#
+# The functions should use ${IMAGE_ROOTFS} to find the unpacked rootfs
+# directory, which if QA passes will be the basis for the images.
 fakeroot python do_image_qa () {
     from oe.utils import ImageQAFailed
 
@@ -320,7 +323,7 @@ fakeroot python do_image_qa () {
         imgname = d.getVar('IMAGE_NAME')
         bb.fatal("QA errors found whilst validating image: %s\n%s" % (imgname, qamsg))
 }
-addtask do_image_qa after do_image_complete before do_build
+addtask do_image_qa after do_rootfs before do_image
 
 SSTATETASKS += "do_image_qa"
 SSTATE_SKIP_CREATION_task-image-qa = '1'

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