[OE-core] [[PATCHv2] 1/2] classes/testsdk: do_testsdkext avoid STAGING_DIR/BASE_WORKDIR in PATH
Aníbal Limón
anibal.limon at linux.intel.com
Thu Feb 11 22:08:05 UTC 2016
The inclusion of STAGING_DIR/BASE_WORKDIR in PATH is contaminating
the environment, i.e. when try to sanity check perl (check_perl_modules)
it takes perl from STAGING_DIR causing eSDK install to fail.
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
---
meta/classes/testsdk.bbclass | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 487f40c..a56ad5e 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -97,9 +97,18 @@ def testsdkext_main(d):
# extensible sdk shows a warning if found bitbake in the path
# because can cause problems so clean it
new_path = ''
+ paths_to_avoid = ['bitbake/bin', 'poky/scripts',
+ d.getVar('STAGING_DIR', True),
+ d.getVar('BASE_WORKDIR', True)]
for p in os.environ['PATH'].split(':'):
- if 'bitbake/bin' in p or 'poky/scripts' in p:
+ avoid = False
+ for pa in paths_to_avoid:
+ if pa in p:
+ avoid = True
+ break
+ if avoid:
continue
+
new_path = new_path + p + ':'
new_path = new_path[:-1]
os.environ['PATH'] = new_path
--
2.1.4
More information about the Openembedded-core
mailing list