diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-16 22:53:46 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:05:17 +0000 |
commit | dc4a612e60d1155f3502c27f831ee20025df027c (patch) | |
tree | a2116e6135adca69e3ea4a631b27b1e8ee14c3a9 /meta/lib | |
parent | d7817471024cab2b9bae58cc8ec76ef9d1b60307 (diff) | |
download | poky-dc4a612e60d1155f3502c27f831ee20025df027c.tar.gz |
image.bbclass: put .env files to ${STAGING_DIR}/imgdata/
As STAGING_DIR_TARGET started to point to a recipe specific
sysroot wic is not able to add .env files when .wks file refers
to multiple rootfs recipes.
Used STAGING_DIR instead of STAGING_DIR_TARGET to make the
directory with .env files the same for all recipes.
(From OE-Core rev: 3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 77f1bdcfa9..6a61ba6868 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py | |||
@@ -332,7 +332,7 @@ class Wic(oeSelfTest): | |||
332 | """Generate and obtain the path to <image>.env""" | 332 | """Generate and obtain the path to <image>.env""" |
333 | if image not in self.wicenv_cache: | 333 | if image not in self.wicenv_cache: |
334 | self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status) | 334 | self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status) |
335 | stdir = get_bb_var('STAGING_DIR_TARGET', image) | 335 | stdir = get_bb_var('STAGING_DIR', image) |
336 | self.wicenv_cache[image] = os.path.join(stdir, 'imgdata') | 336 | self.wicenv_cache[image] = os.path.join(stdir, 'imgdata') |
337 | return self.wicenv_cache[image] | 337 | return self.wicenv_cache[image] |
338 | 338 | ||