summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-09-02 08:52:02 +0000
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-09-12 13:31:05 +0200
commit755654d14e8fddc54ed739461bd529291c1e1230 (patch)
tree9579ceb92c620766c79cf61894aa6565912224ba /classes
parentc415463af9310c564b65bceea394a7ccc8c77e12 (diff)
downloadopenembedded-755654d14e8fddc54ed739461bd529291c1e1230.tar.gz
base.bbclass: fix soc-family test
for now pushed this patch as it fixes the breakage. If it is decided not to have SOC_FAMILY we can always revert or overwrite see http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-September/023680.html Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Chase Maupin <chase.maupin@ti.com> and got a looks good from Phil.
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9fc4bf00b2..b19eb32751 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -338,7 +338,7 @@ python () {
this_machine = bb.data.getVar('MACHINE', d, 1)
if this_machine and not re.match(need_machine, this_machine):
this_soc_family = bb.data.getVar('SOC_FAMILY', d, 1)
- if this_soc_family and not re.match(need_machine, this_soc_family):
+ if (this_soc_family and not re.match(need_machine, this_soc_family)) or not this_soc_family:
raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
need_target = bb.data.getVar('COMPATIBLE_TARGET_SYS', d, 1)