multilib - crosssdk: Stop building multilib for crosssdk packages

Crosssdk packages are not actually multilib packages, so treat them
the same as other nativesdk packages in the multilib, base, and
classextend components.

(From OE-Core rev: 15834451525453e0f7ceac25d4f98117f1825f37)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle
2012-09-26 18:01:04 -05:00
committed by Richard Purdie
parent ea22010560
commit 7e2ff7c012
3 changed files with 8 additions and 8 deletions

View File

@@ -183,7 +183,7 @@ def preferred_ml_updates(d):
providers.append(v)
for pkg, reason in blacklists.items():
if pkg.endswith("-native") or pkg.startswith("nativesdk-") or 'cross-canadian' in pkg:
if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-") or 'cross-canadian' in pkg:
continue
for p in prefixes:
newpkg = p + "-" + pkg
@@ -193,7 +193,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.startswith("nativesdk-"):
if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
continue
if 'cross-canadian' in pkg:
for p in prefixes:
@@ -214,7 +214,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.startswith("nativesdk-"):
if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
continue
if 'cross-canadian' in pkg:
for p in prefixes:
@@ -253,7 +253,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.startswith("nativesdk-") or 'cross-canadian' in p:
if p.endswith(("-native", "-crosssdk")) or p.startswith("nativesdk-") or 'cross-canadian' in p:
continue
virt = ""
if p.startswith("virtual/"):