diff options
| -rw-r--r-- | meta/classes/base.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/multilib.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oe/classextend.py | 4 |
3 files changed, 8 insertions, 8 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/"): diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index de6e59e39d..c249925441 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" diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index c982fb7c3f..c46332c785 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py @@ -50,7 +50,7 @@ class ClassExtender(object): return newdata def map_depends(self, dep): - if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): + if dep.endswith(("-native", "-native-runtime", "-crosssdk")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): return dep else: return self.extend_name(dep) @@ -93,7 +93,7 @@ class ClassExtender(object): class NativesdkClassExtender(ClassExtender): def map_depends(self, dep): - if dep.endswith(("-native", "-native-runtime", "-cross")) or ('nativesdk-' in dep): + if dep.endswith(("-native", "-native-runtime", "-cross", "-crosssdk")) or ('nativesdk-' in dep): return dep elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): return dep + "-crosssdk" |