summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
-rw-r--r--meta/recipes-core/tasks/task-base.bb2
3 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 4d4d2cf2ed..d9cb048690 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -58,7 +58,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIR
58# 58#
59 59
60python __anonymous () { 60python __anonymous () {
61 import bb, re 61 import re
62 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) 62 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
63 if uc_os: 63 if uc_os:
64 raise bb.parse.SkipPackage("incompatible with target %s" % 64 raise bb.parse.SkipPackage("incompatible with target %s" %
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 7e7d68b87d..b76d94320e 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -54,7 +54,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIR
54# 54#
55 55
56python __anonymous () { 56python __anonymous () {
57 import bb, re 57 import re
58 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) 58 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
59 if uc_os: 59 if uc_os:
60 raise bb.parse.SkipPackage("incompatible with target %s" % 60 raise bb.parse.SkipPackage("incompatible with target %s" %
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index b9bc3aae0f..2325dbf291 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -124,8 +124,6 @@ python __anonymous () {
124 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) 124 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
125 # then include task-base-wifi in task-base 125 # then include task-base-wifi in task-base
126 126
127 import bb
128
129 distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) 127 distro_features = set(d.getVar("DISTRO_FEATURES", True).split())
130 machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) 128 machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
131 129