From c01cc6ff241b4a808af8773970a9abe27ae4093e Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 25 Jan 2017 19:39:14 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/lib/oeqa') 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) -- cgit v1.2.3-54-g00ecf