diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-09-26 18:01:04 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-27 09:44:55 +0100 |
| commit | 7e2ff7c0125b40631eee7aeacf59c938bca6d586 (patch) | |
| tree | 8584ff6f0b5c461c500d64cb61942ffe48cc0d2b /meta/classes | |
| parent | ea220105609de30498f4ba72f5aeec180de4be2f (diff) | |
| download | ast2050-yocto-poky-7e2ff7c0125b40631eee7aeacf59c938bca6d586.zip ast2050-yocto-poky-7e2ff7c0125b40631eee7aeacf59c938bca6d586.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.
(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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/base.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/multilib.bbclass | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 12a30c9..783b64d 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/"): diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index de6e59e..c249925 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -28,7 +28,7 @@ python multilib_virtclass_handler () { if bb.data.inherits_class('native', e.data): raise bb.parse.SkipPackage("We can't extend native recipes") - if bb.data.inherits_class('nativesdk', e.data): + if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): raise bb.parse.SkipPackage("We can't extend nativesdk recipes") save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" @@ -101,7 +101,7 @@ python do_package_qa_multilib() { for i in values: if i.startswith('virtual/'): i = i[len('virtual/'):] - if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i): + if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i) and (not i.startswith("nativesdk-")): candidates.append(i) if len(candidates) > 0: bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s" |
