[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2249/8267] image.bbclass: Put image_complete under sstate control

[Emmanuele Bassi <ebassi src gnome org>]

commit def348533aac9d6be06f912dd245d50dcc406816
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Sep 1 11:56:01 2016 +0300

    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>

 meta/classes/image.bbclass |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f6ebbca..8c8b8a2 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}"
 
-IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}"
+IMGDEPLOYDIR = "${WORKDIR}/deploy-${PN}-image-complete"
 
 # Images are generally built explicitly, do not need to be part of world.
 EXCLUDE_FROM_WORLD = "1"
@@ -251,7 +251,7 @@ fakeroot python do_rootfs () {
     progress_reporter.finish()
 }
 do_rootfs[dirs] = "${TOPDIR}"
-do_rootfs[cleandirs] += "${S}"
+do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
 do_rootfs[umask] = "022"
 addtask rootfs before do_build
 
@@ -275,6 +275,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] = "${IMGDEPLOYDIR}"
+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