diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-08-31 14:02:53 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-31 17:53:30 +0100 |
| commit | 13fe6eb5eb77662c09cbb48c626d0e455b5fcae6 (patch) | |
| tree | e8aee0dd68971ce3b4fec2da1f37ab14f92ae213 | |
| parent | e804258722ddc7b338843e51bed1cb41f33cd242 (diff) | |
| download | openembedded-core-contrib-13fe6eb5eb77662c09cbb48c626d0e455b5fcae6.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 DEPLOYDIR 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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2e75e70c16..9b6c739d34 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -74,7 +74,7 @@ IMAGE_INSTALL[type] = "list" export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" -DEPLOYDIR = "${DEPLOY_DIR_IMAGE}" +DEPLOYDIR = "${WORKDIR}/deploy-${PN}-image-complete" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" @@ -264,6 +264,7 @@ fakeroot python do_image () { } do_image[dirs] = "${TOPDIR}" do_image[umask] = "022" +do_image[cleandirs] = "${DEPLOYDIR}" addtask do_image after do_rootfs before do_build fakeroot python do_image_complete () { @@ -275,6 +276,11 @@ fakeroot python do_image_complete () { } do_image_complete[dirs] = "${TOPDIR}" do_image_complete[umask] = "022" +SSTATETASKS += "do_image_complete" +SSTATE_SKIP_CREATION_task-image-complete = '1' +do_image_complete[sstate-inputdirs] = "${DEPLOYDIR}" +do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" +do_image_complete[stamp-extra-info] = "${MACHINE}" addtask do_image_complete after do_image before do_build # Add image-level QA/sanity checks to IMAGE_QA_COMMANDS |