diff options
| -rw-r--r-- | meta/classes/base.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 10cb84ac91..8a74d6e578 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -157,15 +157,15 @@ def preferred_ml_updates(d): for v in versions: val = d.getVar(v, False) pkg = v.replace("PREFERRED_VERSION_", "") - if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): + if pkg.endswith("-native") or "-crosssdk-" in pkg or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): continue - if 'cross-canadian' in pkg: + if '-cross-' in pkg and '${' in pkg: for p in prefixes: localdata = bb.data.createCopy(d) override = ":virtclass-multilib-" + p localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) bb.data.update_data(localdata) - newname = localdata.expand(v) + newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-') if newname != v: newval = localdata.expand(val) d.setVar(newname, newval) |