diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2012-09-26 18:01:04 -0500 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2012-10-26 09:12:15 -0700 |
| commit | 15834451525453e0f7ceac25d4f98117f1825f37 (patch) | |
| tree | 6911b5c1f1a747e4a2c877cfb75ac6f226cfb052 /meta/classes/base.bbclass | |
| parent | 132a182e2f6c330aa645de42c1aeb386e43bddd3 (diff) | |
| download | openembedded-core-15834451525453e0f7ceac25d4f98117f1825f37.tar.gz | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 12a30c953c..783b64d9de 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -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/"): |