diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-25 19:39:14 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:38:32 +0000 |
| commit | c01cc6ff241b4a808af8773970a9abe27ae4093e (patch) | |
| tree | 1a68b2bcc413c115df6fcfcfbf8ee48058747cbf /meta/recipes-core | |
| parent | 3d585a518c7e7490486f31633d61377081ec0155 (diff) | |
| download | openembedded-core-contrib-c01cc6ff241b4a808af8773970a9abe27ae4093e.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.
(From OE-Core rev: 94245144f5cef344d90bc2a7b3267cdae9d192e4)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 2 |
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'): |