[oe-commits] Frans Meulenbroeks : base.bbclass: fix soc-family test

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 755654d14e8fddc54ed739461bd529291c1e1230
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=755654d14e8fddc54ed739461bd529291c1e1230

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Thu Sep  2 08:52:02 2010 +0000

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 at gmail.com>
Acked-by: Chase Maupin <chase.maupin at ti.com>
and got a looks good from Phil.

---

 classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9fc4bf0..b19eb32 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)