PREFERRED_PROVIDER and multilibs
cover PREFERRED_PROVIDER and multilibs
A value of the form PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "..." doesn't work for multilibs in some cases, because of the order in which things are configured. Move the multilib-aware code for PREFERRED_PROVIDER and PREFERRED_VERSION into multilib_global in a new ConfigParsed handler so it can execute at the right time.
I do have a pending mystery, though:
For versions:
+ if '-cross-' in pkg and '${' in pkg:
For providers:
+ if 'cross-canadian' in pkg:
I don't know why these are different, or whether it's intentional.
The following changes since commit 4321c553d5ae816e566234e981a0815bba046d39:
SIGGEN_EXCLUDERECIPES_ABISAFE: add initscripts (2014-08-11 17:44:09 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib seebs/preferred_ml
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/preferred_ml
Peter Seebach (1):
multilib_global.bbclass: PREFERRED_PROVIDERS for multilibs
meta/classes/base.bbclass | 108 ------------------------------- meta/classes/multilib_global.bbclass | 117 +++++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 111 deletions(-)
PATCH 1/1 multilib_global.bbclass: PREFERRED_PROVIDERS for multilibs
The code in base.bbclass to spread PREFERRED_PROVIDERS values to multilibs doesn't work for things which rely on TARGET_PREFIX, such as virtual/${TARGET_PREFIX}gcc. This is because the expansion of TARGET_PREFIX produces the wrong value if executed prior to the assignment of TARGET_VENDOR_virtclass-multilib-libxx, which will always happen since that assignment doesn't happen until recipe parsing, but the PREFERRED_PROVIDERS expansion is happening around ConfigParsed.
To solve this, we make a couple of changes. First, the creation of the TARGET_VENDOR override values is moved into a new ConfigParsed event handler in multilib_global. Second, the preferred_ml_updates() function's code is moved into that function too. It seems safe to assume that PREFERRED_PROVIDER values only need to be spread to other multilibs when multilibs are in use.
I don't think this directly affects any use cases that don't involve third-party or alternative toolchains.
--- meta/classes/base.bbclass | 108 ------------------------------- meta/classes/multilib_global.bbclass | 117 +++++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 111 deletions(-)
meta/classes/base.bbclass +0 -108
@@ -133,113 +133,6 @@ def pkgarch_mapping(d): if d.getVar("TUNE_PKGARCH", True) == "armv7a-vfp-neon": d.setVar("TUNE_PKGARCH", "armv7a") -def preferred_ml_updates(d): - # If any PREFERRED_PROVIDER or PREFERRED_VERSION are set, - # we need to mirror these variables in the multilib case; - multilibs = d.getVar('MULTILIBS', True) or "" - if not multilibs: - return - - prefixes = [] - for ext in multilibs.split(): - eext = ext.split(':') - if len(eext) > 1 and eext[0] == 'multilib': - prefixes.append(eext[1]) - - versions = [] - providers = [] - for v in d.keys(): - if v.startswith("PREFERRED_VERSION_"): - versions.append(v) - if v.startswith("PREFERRED_PROVIDER_"): - providers.append(v) - - for v in versions: - val = d.getVar(v, False) - pkg = v.replace("PREFERRED_VERSION_", "") - if pkg.endswith("-native") or "-crosssdk-" in pkg or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): - continue - if '-cross-' in pkg and '${' 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).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-') - if newname != v: - newval = localdata.expand(val) - d.setVar(newname, newval) - # Avoid future variable key expansion - vexp = d.expand(v) - if v != vexp and d.getVar(v, False): - d.renameVar(v, vexp) - continue - for p in prefixes: - newname = "PREFERRED_VERSION_" + p + "-" + pkg - if not d.getVar(newname, False): - d.setVar(newname, val) - - for prov in providers: - val = d.getVar(prov, False) - pkg = prov.replace("PREFERRED_PROVIDER_", "") - if pkg.endswith("-native") or "-crosssdk-" in pkg or pkg.startswith(("nativesdk-", "virtual/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) - # Avoid future variable key expansion - provexp = d.expand(prov) - if prov != provexp and d.getVar(prov, False): - d.renameVar(prov, provexp) - continue - virt = "" - if pkg.startswith("virtual/"): - pkg = pkg.replace("virtual/", "") - virt = "virtual/" - for p in prefixes: - if pkg != "kernel": - newval = 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 and not d.getVar(newname, False): - d.setVar(newname, localdata.expand(newval)) - - # implement alternative multilib name - newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) - if not d.getVar(newname, False): - d.setVar(newname, newval) - # Avoid future variable key expansion - provexp = d.expand(prov) - if prov != provexp and d.getVar(prov, False): - d.renameVar(prov, provexp) - - - mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() - extramp = [] - for p in mp: - if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: - continue - virt = "" - if p.startswith("virtual/"): - p = p.replace("virtual/", "") - virt = "virtual/" - for pref in prefixes: - extramp.append(virt + pref + "-" + p) - d.setVar("MULTI_PROVIDER_WHITELIST", " ".join(mp + extramp)) - - def get_layers_branch_rev(d): layers = (d.getVar("BBLAYERS", True) or "").split() layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \
@@ -290,7 +183,6 @@ python base_eventhandler() { e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data)) e.data.setVar('BB_VERSION', bb.__version__) pkgarch_mapping(e.data) - preferred_ml_updates(e.data) oe.utils.features_backfill("DISTRO_FEATURES", e.data) oe.utils.features_backfill("MACHINE_FEATURES", e.data)
meta/classes/multilib_global.bbclass +114 -3
125 lines not on this page · raw message
Signature · 1 line
1.7.1