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:13:28 +0000 |
| commit | 94245144f5cef344d90bc2a7b3267cdae9d192e4 (patch) | |
| tree | f9e94c73e91826cffb39cbe15b4649acce131728 | |
| parent | c1be1161cf555727aa56ee2109ee77f420f67c9f (diff) | |
| download | openembedded-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>
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 3 | ||||
| -rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4d50601bb2f..e20e4476806 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: diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 005d1e2d4ec..0e5f38a8b9a 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -216,7 +216,7 @@ IMAGE_CMD_wic () { bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." fi - BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} + BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" rm -rf "$out/" } diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 0a78659bb14..9784a6818e5 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -347,7 +347,8 @@ class Wic(oeSelfTest): if image not in self.wicenv_cache: self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status) stdir = get_bb_var('STAGING_DIR', image) - self.wicenv_cache[image] = os.path.join(stdir, 'imgdata') + machine = get_bb_var('MACHINE', image) + self.wicenv_cache[image] = os.path.join(stdir, machine, 'imgdata') return self.wicenv_cache[image] @testcase(1347) diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index 0a53b7319ec..aa09c82e762 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'): |