summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-26 18:01:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:44:55 +0100
commit7e2ff7c0125b40631eee7aeacf59c938bca6d586 (patch)
tree8584ff6f0b5c461c500d64cb61942ffe48cc0d2b /meta/classes
parentea220105609de30498f4ba72f5aeec180de4be2f (diff)
downloadpoky-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.bbclass8
-rw-r--r--meta/classes/multilib.bbclass4
2 files changed, 6 insertions, 6 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):
183 providers.append(v) 183 providers.append(v)
184 184
185 for pkg, reason in blacklists.items(): 185 for pkg, reason in blacklists.items():
186 if pkg.endswith("-native") or pkg.startswith("nativesdk-") or 'cross-canadian' in pkg: 186 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-") or 'cross-canadian' in pkg:
187 continue 187 continue
188 for p in prefixes: 188 for p in prefixes:
189 newpkg = p + "-" + pkg 189 newpkg = p + "-" + pkg
@@ -193,7 +193,7 @@ def preferred_ml_updates(d):
193 for v in versions: 193 for v in versions:
194 val = d.getVar(v, False) 194 val = d.getVar(v, False)
195 pkg = v.replace("PREFERRED_VERSION_", "") 195 pkg = v.replace("PREFERRED_VERSION_", "")
196 if pkg.endswith("-native") or pkg.startswith("nativesdk-"): 196 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
197 continue 197 continue
198 if 'cross-canadian' in pkg: 198 if 'cross-canadian' in pkg:
199 for p in prefixes: 199 for p in prefixes:
@@ -214,7 +214,7 @@ def preferred_ml_updates(d):
214 for prov in providers: 214 for prov in providers:
215 val = d.getVar(prov, False) 215 val = d.getVar(prov, False)
216 pkg = prov.replace("PREFERRED_PROVIDER_", "") 216 pkg = prov.replace("PREFERRED_PROVIDER_", "")
217 if pkg.endswith("-native") or pkg.startswith("nativesdk-"): 217 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
218 continue 218 continue
219 if 'cross-canadian' in pkg: 219 if 'cross-canadian' in pkg:
220 for p in prefixes: 220 for p in prefixes:
@@ -253,7 +253,7 @@ def preferred_ml_updates(d):
253 mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() 253 mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
254 extramp = [] 254 extramp = []
255 for p in mp: 255 for p in mp:
256 if p.endswith("-native") or p.startswith("nativesdk-") or 'cross-canadian' in p: 256 if p.endswith(("-native", "-crosssdk")) or p.startswith("nativesdk-") or 'cross-canadian' in p:
257 continue 257 continue
258 virt = "" 258 virt = ""
259 if p.startswith("virtual/"): 259 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 () {
28 if bb.data.inherits_class('native', e.data): 28 if bb.data.inherits_class('native', e.data):
29 raise bb.parse.SkipPackage("We can't extend native recipes") 29 raise bb.parse.SkipPackage("We can't extend native recipes")
30 30
31 if bb.data.inherits_class('nativesdk', e.data): 31 if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
32 raise bb.parse.SkipPackage("We can't extend nativesdk recipes") 32 raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
33 33
34 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" 34 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
@@ -101,7 +101,7 @@ python do_package_qa_multilib() {
101 for i in values: 101 for i in values:
102 if i.startswith('virtual/'): 102 if i.startswith('virtual/'):
103 i = i[len('virtual/'):] 103 i = i[len('virtual/'):]
104 if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i): 104 if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i) and (not i.startswith("nativesdk-")):
105 candidates.append(i) 105 candidates.append(i)
106 if len(candidates) > 0: 106 if len(candidates) > 0:
107 bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s" 107 bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s"