diff options
| -rw-r--r-- | meta/classes/base.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index abd6a526c3..641316d1fa 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -515,11 +515,12 @@ python () { | |||
| 515 | need_machine = d.getVar('COMPATIBLE_MACHINE', True) | 515 | need_machine = d.getVar('COMPATIBLE_MACHINE', True) |
| 516 | if need_machine: | 516 | if need_machine: |
| 517 | import re | 517 | import re |
| 518 | this_machine = d.getVar('MACHINE', True) | 518 | compat_machines = (d.getVar('MACHINEOVERRIDES', True) or "").split(":") |
| 519 | if this_machine and not re.match(need_machine, this_machine): | 519 | for m in compat_machines: |
| 520 | this_soc_family = d.getVar('SOC_FAMILY', True) | 520 | if re.match(need_machine, m): |
| 521 | if (this_soc_family and not re.match(need_machine, this_soc_family)) or not this_soc_family: | 521 | break |
| 522 | raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) | 522 | else: |
| 523 | raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % d.getVar('MACHINE', True)) | ||
| 523 | 524 | ||
| 524 | 525 | ||
| 525 | bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() | 526 | bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() |