mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/image: move image_qa to between rootfs and image

Browse Source 
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.

(From OE-Core rev: 62ce334e583ecdf1f93619f4131c0fa5d88d5b02)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2017-09-19 17:20:37 +01:00
committed by Richard Purdie
parent 7df44282c2
commit dc6a45889d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meta/classes/image.bbclass
View File

@@ -297,8 +297,11 @@ addtask do_image_complete_setscene
# IMAGE_QA_COMMANDS += " \ # IMAGE_QA_COMMANDS += " \
# image_check_everything_ok \ # 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. # 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 () { fakeroot python do_image_qa () {
from oe.utils import ImageQAFailed from oe.utils import ImageQAFailed
@@ -320,7 +323,7 @@ fakeroot python do_image_qa () {
imgname = d.getVar('IMAGE_NAME') imgname = d.getVar('IMAGE_NAME')
bb.fatal("QA errors found whilst validating image: %s\n%s" % (imgname, qamsg)) 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" SSTATETASKS += "do_image_qa"
SSTATE_SKIP_CREATION_task-image-qa = '1' SSTATE_SKIP_CREATION_task-image-qa = '1'