diff options
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 59febd1022..801896a5b9 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -191,7 +191,7 @@ def preferred_ml_updates(d): for v in versions: val = d.getVar(v, False) pkg = v.replace("PREFERRED_VERSION_", "") - if pkg.endswith("-native") or pkg.endswith("-nativesdk"): + if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue for p in prefixes: newname = "PREFERRED_VERSION_" + p + "-" + pkg @@ -201,7 +201,7 @@ def preferred_ml_updates(d): for prov in providers: val = d.getVar(prov, False) pkg = prov.replace("PREFERRED_PROVIDER_", "") - if pkg.endswith("-native") or pkg.endswith("-nativesdk"): + if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue virt = "" if pkg.startswith("virtual/"): @@ -218,7 +218,7 @@ def preferred_ml_updates(d): mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() extramp = [] for p in mp: - if p.endswith("-native") or p.endswith("-nativesdk"): + if p.endswith("-native") or p.startswith("nativesdk-"): continue virt = "" if p.startswith("virtual/"): @@ -359,15 +359,18 @@ python () { subs = a.split("/", 1)[1] newappends.append("virtual/" + prefix + subs + extension) else: - newappends.append(prefix + a + extension) + if a.startswith(prefix): + newappends.append(a + extension) + else: + newappends.append(prefix + a + extension) return newappends def appendVar(varname, appends): if not appends: return if varname.find("DEPENDS") != -1: - if pn.endswith("-nativesdk"): - appends = expandFilter(appends, "-nativesdk", "") + if pn.startswith("nativesdk-"): + appends = expandFilter(appends, "", "nativesdk-") if pn.endswith("-native"): appends = expandFilter(appends, "-native", "") if mlprefix: @@ -456,7 +459,7 @@ python () { dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', True) - if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.endswith("-nativesdk"): + if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("nativesdk-"): # Internally, we'll use the license mapping. This way INCOMPATIBLE_LICENSE = "GPLv2" and # INCOMPATIBLE_LICENSE = "GPLv2.0" will pick up all variations of GPL-2.0 spdx_license = return_spdx(d, dont_want_license) |