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 /meta/lib | |
| parent | c1be1161cf555727aa56ee2109ee77f420f67c9f (diff) | |
| download | openembedded-core-94245144f5cef344d90bc2a7b3267cdae9d192e4.tar.gz openembedded-core-94245144f5cef344d90bc2a7b3267cdae9d192e4.tar.bz2 openembedded-core-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/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 0a78659bb1..9784a6818e 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) |