sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 32611395e1da21f6f7f7916fb8077e35ee81bb23)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón 2016-02-11 16:08:05 -06:00 committed by Richard Purdie
parent f56e9aa9a0
commit 5e978d7ed8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes/testsdk.bbclass
View File

@ -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