aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
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/classes/image.bbclass
parentc1be1161cf555727aa56ee2109ee77f420f67c9f (diff)
downloadopenembedded-core-contrib-94245144f5cef344d90bc2a7b3267cdae9d192e4.tar.gz
openembedded-core-contrib-94245144f5cef344d90bc2a7b3267cdae9d192e4.tar.bz2
openembedded-core-contrib-94245144f5cef344d90bc2a7b3267cdae9d192e4.zip
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/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 4d50601bb2..e20e447680 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -337,7 +337,7 @@ python do_rootfs_wicenv () {
return
stdir = d.getVar('STAGING_DIR')
- outdir = os.path.join(stdir, 'imgdata')
+ outdir = os.path.join(stdir, d.getVar('MACHINE'), 'imgdata')
bb.utils.mkdirhier(outdir)
basename = d.getVar('IMAGE_BASENAME')
with open(os.path.join(outdir, basename) + '.env', 'w') as envf: