base.bbclass: fix soc-family test
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Thu, 2 Sep 2010 08:52:02 +0000 (08:52 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Sun, 12 Sep 2010 11:31:05 +0000 (13:31 +0200)
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.

classes/base.bbclass

index 9fc4bf0..b19eb32 100644 (file)
@@ -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)