Skip to contentSkip to conversation

1/2] classes/testsdk: do_testsdkext avoid STAGING_DIR/BASE_WORKDIR in PATH

PATCH New Aníbal Limón 1 participant 2 messages Feb 11, 2016

lore
Share & tools
lore

Aníbal Limón

author
#0 lore raw

PATCH v2 1/1 1/2] 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 <[email protected]>
---
 meta/classes/testsdk.bbclass | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
meta/classes/testsdk.bbclass +10 -1
index 487f40c..a56ad5e 100644
@@ -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
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH v2 1/1 2/2] nativesdk-buildtools-perl-dummy.bb: Fix variable expansion in python code

Since python expansion of bb data variables is disable in order to provide a standard interface usage for expand variables this variables aren't expanded now so change to call d.expand('${VAR}').

This API expansion change was causing to install perl in nativesdk.

Signed-off-by Aníbal Limón <[email protected]>
---
 meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +2 -2
index 9041734..90784a9 100644
@@ -20,7 +20,7 @@ PERLPACKAGES = "nativesdk-perl \
 ALLOW_EMPTY_${PN} = "1"
 
 python populate_packages_prepend() {
-    d.appendVar('RPROVIDES_${PN}', '${PERLPACKAGES}')
-    d.appendVar('RCONFLICTS_${PN}', '${PERLPACKAGES}')
+    d.appendVar(d.expand('RPROVIDES_${PN}'), '${PERLPACKAGES}')
+    d.appendVar(d.expand('RCONFLICTS_${PN}'), '${PERLPACKAGES}')
 }
Signature · 1 line
2.1.4