[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4184/8267] image.bbclass: put .env files to ${STAGING_DIR}/imgdata/

[Emmanuele Bassi <ebassi src gnome org>]

commit dc4a612e60d1155f3502c27f831ee20025df027c
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Mon Jan 16 22:53:46 2017 +0200

    image.bbclass: put .env files to ${STAGING_DIR}/imgdata/
    
    As STAGING_DIR_TARGET started to point to a recipe specific
    sysroot wic is not able to add .env files when .wks file refers
    to multiple rootfs recipes.
    
    Used STAGING_DIR instead of STAGING_DIR_TARGET to make the
    directory with .env files the same for all recipes.
    
    (From OE-Core rev: 3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c)
    
    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/image_types.bbclass |    2 +-
 meta/lib/oeqa/selftest/wic.py    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5fc7385..fb0cce3 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -342,7 +342,7 @@ python do_rootfs_wicenv () {
     if not wicvars:
         return
 
-    stdir = d.getVar('STAGING_DIR_TARGET')
+    stdir = d.getVar('STAGING_DIR')
     outdir = os.path.join(stdir, 'imgdata')
     bb.utils.mkdirhier(outdir)
     basename = d.getVar('IMAGE_BASENAME')
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index bac7ff5..5b1746a 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -216,7 +216,7 @@ IMAGE_CMD_wic () {
                bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or 
WKS_FILES appropriately."
        fi
 
-       BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" 
-o "$out/" ${WIC_CREATE_EXTRA_ARGS}
+       BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o 
"$out/" ${WIC_CREATE_EXTRA_ARGS}
        mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
        rm -rf "$out/"
 }
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 77f1bdc..6a61ba6 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -332,7 +332,7 @@ class Wic(oeSelfTest):
         """Generate and obtain the path to <image>.env"""
         if image not in self.wicenv_cache:
             self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status)
-            stdir = get_bb_var('STAGING_DIR_TARGET', image)
+            stdir = get_bb_var('STAGING_DIR', image)
             self.wicenv_cache[image] = os.path.join(stdir, 'imgdata')
         return self.wicenv_cache[image]