[v5] base.bbclass: Add matching of MACHINEOVERRIDES in COMPATIBLE_MACHINE

Submitted by Otavio Salvador on April 9, 2013, 12:37 p.m. | Patch ID: 47695


Message ID 1365511051-30507-1-git-send-email-otavio@ossystems.com.br
State New
Headers show

Commit Message

Otavio Salvador April 9, 2013, 12:37 p.m.
When a MACHINEOVERRIDES has more than one value, split by ':' as usual
OVERRIDES, this were not being properly checked in COMPATIBLE_MACHINE
matching as we need to iterate over each SoC family and check if it is
compatible or not.

The code has been change from SOC_FAMILY to MACHINEOVERRIDES as the
former in fact appends the value to the later, so the right variable
to match is MACHINEOVERRIDES. This also allows for later removal of
SOC_FAMILY if desired as the only functional difference between both
is now ironed out.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Changes for v5:
- Improve commit log (pb_)

 meta/classes/base.bbclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index abd6a52..641316d 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -515,11 +515,12 @@  python () {
         need_machine = d.getVar('COMPATIBLE_MACHINE', True)
         if need_machine:
             import re
-            this_machine = d.getVar('MACHINE', True)
-            if this_machine and not re.match(need_machine, this_machine):
-                this_soc_family = d.getVar('SOC_FAMILY', True)
-                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 (not in COMPATIBLE_MACHINE)" % this_machine)
+            compat_machines = (d.getVar('MACHINEOVERRIDES', True) or "").split(":")
+            for m in compat_machines:
+                if re.match(need_machine, m):
+                    break
+            else:
+                raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE', True))
         bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split()