summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-01 11:56:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-04 00:07:28 +0100
commitdef348533aac9d6be06f912dd245d50dcc406816 (patch)
treec8c4279efeea7bbf9446b2abf25775d87b9ba61b /meta
parent5f9889edb3bd3948285b3ffb9880c7b38f35e65b (diff)
downloadpoky-def348533aac9d6be06f912dd245d50dcc406816.tar.gz
image.bbclass: Put image_complete under sstate control
Adding image_complete task should make sstate machinery to generate manifest for deployed images and do final deployment to DEPLOY_DIR_IMAGE. Made sure IMGDEPLOYDIR doesn't contain images from past deployments to prevent them to be included into sstate manifests. Set stamp-extra-info flag for do_image_complete task. This flag is used in the name of sstate manifest. Setting it to predetermined value for image_complete should help to get correct manifest filenames when processing runQueueTask events. (From OE-Core rev: d54339d4b1a7e884de636f6325ca60409ebd95ff) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f6ebbca5f3..8c8b8a2bf2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -74,7 +74,7 @@ IMAGE_INSTALL[type] = "list"
74export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" 74export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
75PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" 75PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
76 76
77IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}" 77IMGDEPLOYDIR = "${WORKDIR}/deploy-${PN}-image-complete"
78 78
79# Images are generally built explicitly, do not need to be part of world. 79# Images are generally built explicitly, do not need to be part of world.
80EXCLUDE_FROM_WORLD = "1" 80EXCLUDE_FROM_WORLD = "1"
@@ -251,7 +251,7 @@ fakeroot python do_rootfs () {
251 progress_reporter.finish() 251 progress_reporter.finish()
252} 252}
253do_rootfs[dirs] = "${TOPDIR}" 253do_rootfs[dirs] = "${TOPDIR}"
254do_rootfs[cleandirs] += "${S}" 254do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
255do_rootfs[umask] = "022" 255do_rootfs[umask] = "022"
256addtask rootfs before do_build 256addtask rootfs before do_build
257 257
@@ -275,6 +275,11 @@ fakeroot python do_image_complete () {
275} 275}
276do_image_complete[dirs] = "${TOPDIR}" 276do_image_complete[dirs] = "${TOPDIR}"
277do_image_complete[umask] = "022" 277do_image_complete[umask] = "022"
278SSTATETASKS += "do_image_complete"
279SSTATE_SKIP_CREATION_task-image-complete = '1'
280do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}"
281do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
282do_image_complete[stamp-extra-info] = "${MACHINE}"
278addtask do_image_complete after do_image before do_build 283addtask do_image_complete after do_image before do_build
279 284
280# Add image-level QA/sanity checks to IMAGE_QA_COMMANDS 285# Add image-level QA/sanity checks to IMAGE_QA_COMMANDS