summaryrefslogtreecommitdiffstats
path: root/meta/classes/testsdk.bbclass
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-02-11 16:08:05 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 22:33:17 +0000
commit32611395e1da21f6f7f7916fb8077e35ee81bb23 (patch)
tree54659f1ac5cee5d02e8ae845d24c703c1cbeba07 /meta/classes/testsdk.bbclass
parent798aa553e46e0141c8998399820510812d5e51b7 (diff)
downloadopenembedded-core-32611395e1da21f6f7f7916fb8077e35ee81bb23.tar.gz
openembedded-core-32611395e1da21f6f7f7916fb8077e35ee81bb23.tar.bz2
openembedded-core-32611395e1da21f6f7f7916fb8077e35ee81bb23.zip
classes/testsdk: do_testsdkext avoid STAGING_DIR/BASE_WORKDIR in PATH
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r--meta/classes/testsdk.bbclass11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 487f40cea4..a56ad5edfc 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