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.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5fc7385d79a02eb41de94e6319e152a00ad789e2..fb0cce35c5cc57bfa6defcb589465db6590f3e10 100644 (file)
--- 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 bac7ff5d37c4517a3f5f79b4de272c6fd60bc528..5b1746a68ced86871472221a796db4e2c32be8c4 100644 (file)
--- 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 77f1bdcfa93646538685f0c4b01681302891ee5a..6a61ba6868107c741009deef1572bc652f028901 100644 (file)
--- 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]