From 4ae0c84568f39661722cbceba8ddab22cffe5003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Sun, 21 Feb 2016 12:31:50 -0600 Subject: classes/testsdk: Move the removal of bitbake PATH to eSDK context only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton --- meta/classes/testsdk.bbclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'meta/classes/testsdk.bbclass') 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): # extensible sdk use network export_proxies(d) - # extensible sdk shows a warning if found bitbake in the path - # because can cause problems so clean it - paths_to_avoid = ['bitbake/bin', 'poky/scripts', - d.getVar('STAGING_DIR', True), - d.getVar('BASE_WORKDIR', True)] + # extensible sdk can be contaminated if native programs are + # in PATH, i.e. use perl-native instead of eSDK one. + paths_to_avoid = [d.getVar('STAGING_DIR', True), + d.getVar('BASE_WORKDIR', True)] os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) pn = d.getVar("PN", True) -- cgit v1.2.3