[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2246/8267] image/populate_sdk_base: Add *DEPLOYDIR variables

[Emmanuele Bassi <ebassi src gnome org>]

commit 619d2996fbb12e6ab63daa73b2d9683023cc2744
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Aug 31 14:02:50 2016 +0300

    image/populate_sdk_base: Add *DEPLOYDIR variables
    
    This is a preparation for changing deployment directory for image
    and populate_sdk targets.
    
    Introduced new variables, IMGDEPLOYDIR and SDKDEPLOYDIR. Set it to current
    image/sdk deployment locations.
    
    (From OE-Core rev: 8969b885044eb46dba3dbf62a0243aef673443d3)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass             |    2 ++
 meta/classes/populate_sdk_base.bbclass |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c06dee2..52c740c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -74,6 +74,8 @@ IMAGE_INSTALL[type] = "list"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
 PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
 
+IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}"
+
 # Images are generally built explicitly, do not need to be part of world.
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 645a7f4..0a85a98 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -26,6 +26,8 @@ SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
 
+SDKDEPLOYDIR = "${SDK_DEPLOY}"
+
 B_task-populate-sdk = "${SDK_DIR}"
 
 SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"