summaryrefslogtreecommitdiffstats
path: root/meta/classes/testsdk.bbclass
diff options
context:
space:
mode:
authorAníbal Limón <limon.anibal@gmail.com>2016-02-21 12:31:50 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:06 +0000
commit2a410b225ab90d3655a4fd637ae77965c4c9fbfb (patch)
treeb3256cd3fe21fe16cf14a9144b7c15db45b2433e /meta/classes/testsdk.bbclass
parenteb1f8b9427c1b346c1113f74df678883e9b2c729 (diff)
downloadpoky-2a410b225ab90d3655a4fd637ae77965c4c9fbfb.tar.gz
classes/testsdk: Move the removal of bitbake PATH to eSDK context only
The removal of bitbake and scripts PATH is only needed by eSDK tests so move to eSDK context only. This also it's a support for eSDK update test because it needs to execute oe-publish-sdk from scripts. (From OE-Core rev: 4ae0c84568f39661722cbceba8ddab22cffe5003) Signed-off-by: Aníbal Limón <limon.anibal@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r--meta/classes/testsdk.bbclass9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 41e03d6e06..157077e18e 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -96,11 +96,10 @@ def testsdkext_main(d):
96 # extensible sdk use network 96 # extensible sdk use network
97 export_proxies(d) 97 export_proxies(d)
98 98
99 # extensible sdk shows a warning if found bitbake in the path 99 # extensible sdk can be contaminated if native programs are
100 # because can cause problems so clean it 100 # in PATH, i.e. use perl-native instead of eSDK one.
101 paths_to_avoid = ['bitbake/bin', 'poky/scripts', 101 paths_to_avoid = [d.getVar('STAGING_DIR', True),
102 d.getVar('STAGING_DIR', True), 102 d.getVar('BASE_WORKDIR', True)]
103 d.getVar('BASE_WORKDIR', True)]
104 os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) 103 os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid)
105 104
106 pn = d.getVar("PN", True) 105 pn = d.getVar("PN", True)