mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

multilib - crosssdk: Stop building multilib for crosssdk packages

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/base.bbclass
+4 -4
View File
@@ -183,7 +183,7 @@ def preferred_ml_updates(d):
providers.append(v) providers.append(v)
for pkg, reason in blacklists.items(): 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 continue
for p in prefixes: for p in prefixes:
newpkg = p + "-" + pkg newpkg = p + "-" + pkg
@@ -193,7 +193,7 @@ def preferred_ml_updates(d):
for v in versions: for v in versions:
val = d.getVar(v, False) val = d.getVar(v, False)
pkg = v.replace("PREFERRED_VERSION_", "") pkg = v.replace("PREFERRED_VERSION_", "")
if pkg.endswith("-native") or pkg.startswith("nativesdk-"): if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
continue continue
if 'cross-canadian' in pkg: if 'cross-canadian' in pkg:
for p in prefixes: for p in prefixes:
@@ -214,7 +214,7 @@ def preferred_ml_updates(d):
for prov in providers: for prov in providers:
val = d.getVar(prov, False) val = d.getVar(prov, False)
pkg = prov.replace("PREFERRED_PROVIDER_", "") pkg = prov.replace("PREFERRED_PROVIDER_", "")
if pkg.endswith("-native") or pkg.startswith("nativesdk-"): if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
continue continue
if 'cross-canadian' in pkg: if 'cross-canadian' in pkg:
for p in prefixes: for p in prefixes:
@@ -253,7 +253,7 @@ def preferred_ml_updates(d):
mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
extramp = [] extramp = []
for p in mp: 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 continue
virt = "" virt = ""
if p.startswith("virtual/"): if p.startswith("virtual/"):
meta/classes/multilib.bbclass
+2 -2
View File
@@ -28,7 +28,7 @@ python multilib_virtclass_handler () {
if bb.data.inherits_class('native', e.data): if bb.data.inherits_class('native', e.data):
raise bb.parse.SkipPackage("We can't extend native recipes") 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") raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
@@ -101,7 +101,7 @@ python do_package_qa_multilib() {
for i in values: for i in values:
if i.startswith('virtual/'): if i.startswith('virtual/'):
i = i[len('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) candidates.append(i)
if len(candidates) > 0: if len(candidates) > 0:
bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s" bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s"
meta/lib/oe/classextend.py
+2 -2
View File
@@ -50,7 +50,7 @@ class ClassExtender(object):
return newdata return newdata
def map_depends(self, dep): 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 return dep
else: else:
return self.extend_name(dep) return self.extend_name(dep)
@@ -93,7 +93,7 @@ class ClassExtender(object):
class NativesdkClassExtender(ClassExtender): class NativesdkClassExtender(ClassExtender):
def map_depends(self, dep): 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 return dep
elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")):
return dep + "-crosssdk" return dep + "-crosssdk"