From 3797cfd7473d3f9b7c0d999dcf9cd9608c8c7c6c Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 16 Jan 2017 22:53:46 +0200 Subject: 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. Signed-off-by: Ed Bartosh --- meta/lib/oeqa/selftest/wic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib') 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): """Generate and obtain the path to .env""" if image not in self.wicenv_cache: self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status) - stdir = get_bb_var('STAGING_DIR_TARGET', image) + stdir = get_bb_var('STAGING_DIR', image) self.wicenv_cache[image] = os.path.join(stdir, 'imgdata') return self.wicenv_cache[image] -- cgit v1.2.3