summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-16 22:53:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:17 +0000
commitdc4a612e60d1155f3502c27f831ee20025df027c (patch)
treea2116e6135adca69e3ea4a631b27b1e8ee14c3a9 /meta/classes/image.bbclass
parentd7817471024cab2b9bae58cc8ec76ef9d1b60307 (diff)
downloadpoky-dc4a612e60d1155f3502c27f831ee20025df027c.tar.gz
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>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 5fc7385d79..fb0cce35c5 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -342,7 +342,7 @@ python do_rootfs_wicenv () {
342 if not wicvars: 342 if not wicvars:
343 return 343 return
344 344
345 stdir = d.getVar('STAGING_DIR_TARGET') 345 stdir = d.getVar('STAGING_DIR')
346 outdir = os.path.join(stdir, 'imgdata') 346 outdir = os.path.join(stdir, 'imgdata')
347 bb.utils.mkdirhier(outdir) 347 bb.utils.mkdirhier(outdir)
348 basename = d.getVar('IMAGE_BASENAME') 348 basename = d.getVar('IMAGE_BASENAME')