aboutsummaryrefslogtreecommitdiffstats
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:03:51 +0000
commit3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c (patch)
tree7541a624ec2cd37a8d66f614ecfaf340e02a6396 /meta/classes/image.bbclass
parent3443ff47374c7e20ea54e838609b991f3f72810e (diff)
downloadopenembedded-core-contrib-3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c.tar.gz
openembedded-core-contrib-3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c.tar.bz2
openembedded-core-contrib-3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c.zip
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>
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 () {
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')