diff options
Diffstat (limited to 'meta/classes/base.bbclass')
-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 8a74d6e578..c0d2c8ec88 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -182,7 +182,7 @@ def preferred_ml_updates(d): | |||
182 | for prov in providers: | 182 | for prov in providers: |
183 | val = d.getVar(prov, False) | 183 | val = d.getVar(prov, False) |
184 | pkg = prov.replace("PREFERRED_PROVIDER_", "") | 184 | pkg = prov.replace("PREFERRED_PROVIDER_", "") |
185 | if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): | 185 | if pkg.endswith("-native") or "-crosssdk-" in pkg or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): |
186 | continue | 186 | continue |
187 | if 'cross-canadian' in pkg: | 187 | if 'cross-canadian' in pkg: |
188 | for p in prefixes: | 188 | for p in prefixes: |
@@ -229,7 +229,7 @@ def preferred_ml_updates(d): | |||
229 | mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() | 229 | mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() |
230 | extramp = [] | 230 | extramp = [] |
231 | for p in mp: | 231 | for p in mp: |
232 | if p.endswith(("-native", "-crosssdk")) or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: | 232 | if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: |
233 | continue | 233 | continue |
234 | virt = "" | 234 | virt = "" |
235 | if p.startswith("virtual/"): | 235 | if p.startswith("virtual/"): |
@@ -413,7 +413,7 @@ python () { | |||
413 | appends = bb.utils.explode_deps(d.expand(" ".join(appends))) | 413 | appends = bb.utils.explode_deps(d.expand(" ".join(appends))) |
414 | newappends = [] | 414 | newappends = [] |
415 | for a in appends: | 415 | for a in appends: |
416 | if a.endswith("-native") or a.endswith("-cross"): | 416 | if a.endswith("-native") or ("-cross-" in a): |
417 | newappends.append(a) | 417 | newappends.append(a) |
418 | elif a.startswith("virtual/"): | 418 | elif a.startswith("virtual/"): |
419 | subs = a.split("/", 1)[1] | 419 | subs = a.split("/", 1)[1] |