aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/meta/wic-tools.bb
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-25 19:39:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:13:28 +0000
commit94245144f5cef344d90bc2a7b3267cdae9d192e4 (patch)
treef9e94c73e91826cffb39cbe15b4649acce131728 /meta/recipes-core/meta/wic-tools.bb
parentc1be1161cf555727aa56ee2109ee77f420f67c9f (diff)
downloadopenembedded-core-contrib-94245144f5cef344d90bc2a7b3267cdae9d192e4.tar.gz
wic: change location of .env files
Current location of .env files $STAGING_DIR/imagedata. It doesn't depend on machine and be rewritten by the builds for different machines. Changed location to $STAGING_DIR/$MACHINE/imagedata to avoid .env files to be rewritten. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/meta/wic-tools.bb')
-rw-r--r--meta/recipes-core/meta/wic-tools.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index 0a53b7319e..aa09c82e76 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -14,7 +14,7 @@ python do_build_sysroot () {
# Write environment variables used by wic
# to tmp/sysroots/<machine>/imgdata/wictools.env
- outdir = os.path.join(d.getVar('STAGING_DIR'), 'imgdata')
+ outdir = os.path.join(d.getVar('STAGING_DIR'), d.getVar('MACHINE'), 'imgdata')
bb.utils.mkdirhier(outdir)
with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf:
for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'):