summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-09-19 17:20:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 09:24:00 +0100
commit62ce334e583ecdf1f93619f4131c0fa5d88d5b02 (patch)
treeb8078f1f85a674fd5add00d6605f53469156cd5b
parent73afabf8e69019f08b424a06f3eafaab052b0606 (diff)
downloadopenembedded-core-contrib-62ce334e583ecdf1f93619f4131c0fa5d88d5b02.tar.gz
openembedded-core-contrib-62ce334e583ecdf1f93619f4131c0fa5d88d5b02.tar.bz2
openembedded-core-contrib-62ce334e583ecdf1f93619f4131c0fa5d88d5b02.zip
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@intel.com>
-rw-r--r--meta/classes/image.bbclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 3639aa44f4..4850eed771 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'