diff options
| -rw-r--r-- | meta/classes/base.bbclass | 39 | ||||
| -rw-r--r-- | meta/classes/multilib.bbclass | 18 | ||||
| -rw-r--r-- | meta/lib/oe/classextend.py | 4 |
3 files changed, 53 insertions, 8 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index f254306d3b..12a30c953c 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -183,6 +183,8 @@ 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: + continue for p in prefixes: newpkg = p + "-" + pkg if not d.getVarFlag('PNBLACKLIST', newpkg, True): @@ -193,6 +195,17 @@ def preferred_ml_updates(d): pkg = v.replace("PREFERRED_VERSION_", "") if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue + if 'cross-canadian' in pkg: + for p in prefixes: + localdata = bb.data.createCopy(d) + override = ":virtclass-multilib-" + p + localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) + bb.data.update_data(localdata) + newname = localdata.expand(v) + if newname != v: + newval = localdata.getVar(v, True) + d.setVar(newname, newval) + continue for p in prefixes: newname = "PREFERRED_VERSION_" + p + "-" + pkg if not d.getVar(newname, False): @@ -203,14 +216,36 @@ def preferred_ml_updates(d): pkg = prov.replace("PREFERRED_PROVIDER_", "") if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue + if 'cross-canadian' in pkg: + for p in prefixes: + localdata = bb.data.createCopy(d) + override = ":virtclass-multilib-" + p + localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) + bb.data.update_data(localdata) + newname = localdata.expand(prov) + if newname != prov: + newval = localdata.expand(val) + d.setVar(newname, newval) + continue virt = "" if pkg.startswith("virtual/"): pkg = pkg.replace("virtual/", "") virt = "virtual/" for p in prefixes: - newname = "PREFERRED_PROVIDER_" + virt + p + "-" + pkg if pkg != "kernel": val = p + "-" + val + + # implement variable keys + localdata = bb.data.createCopy(d) + override = ":virtclass-multilib-" + p + localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) + bb.data.update_data(localdata) + newname = localdata.expand(prov) + if newname != prov: + d.setVar(newname, localdata.expand(val)) + + # implement alternative multilib name + newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) if not d.getVar(newname, False): d.setVar(newname, val) @@ -218,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-"): + if p.endswith("-native") 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 3824f3b117..de6e59e39d 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -18,6 +18,13 @@ python multilib_virtclass_handler () { e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) return + if bb.data.inherits_class('cross-canadian', e.data): + e.data.setVar("MLPREFIX", variant + "-") + override = ":virtclass-multilib-" + variant + e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + bb.data.update_data(e.data) + return + if bb.data.inherits_class('native', e.data): raise bb.parse.SkipPackage("We can't extend native recipes") @@ -69,12 +76,16 @@ python __anonymous () { if bb.data.inherits_class('image', d) or bb.data.inherits_class('populate_sdk_base', d): return + clsextend.map_depends_variable("DEPENDS") + clsextend.map_variable("PROVIDES") + + if bb.data.inherits_class('cross-canadian', d): + return + clsextend.rename_packages() clsextend.rename_package_variables((d.getVar("PACKAGEVARS", True) or "").split()) - clsextend.map_depends_variable("DEPENDS") clsextend.map_packagevars() - clsextend.map_variable("PROVIDES") clsextend.map_regexp_variable("PACKAGES_DYNAMIC") clsextend.map_variable("PACKAGE_INSTALL") clsextend.map_variable("INITSCRIPT_PACKAGES") @@ -90,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)): + if (not i.startswith('kernel-module')) and (not i.startswith(mlprefix)) and (not 'cross-canadian' in i): candidates.append(i) if len(candidates) > 0: bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s" @@ -109,4 +120,3 @@ python do_package_qa_multilib() { check_mlprefix(pkg, 'RREPLACES', ml) check_mlprefix(pkg, 'RCONFLICTS', ml) } - diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 857a6c97ef..c982fb7c3f 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")): + if dep.endswith(("-native", "-native-runtime")) 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")): + if dep.endswith(("-native", "-native-runtime", "-cross")) or ('nativesdk-' in dep): return dep elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): return dep + "-crosssdk" |