diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index fd0bfe1273..0b41a8a36d 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -13,11 +13,14 @@ def preferred_ml_updates(d): versions = [] providers = [] + rproviders = [] for v in d.keys(): if v.startswith("PREFERRED_VERSION_"): versions.append(v) if v.startswith("PREFERRED_PROVIDER_"): providers.append(v) + if v.startswith("PREFERRED_RPROVIDER_"): + rproviders.append(v) for v in versions: val = d.getVar(v, False) @@ -91,6 +94,29 @@ def preferred_ml_updates(d): if prov != provexp and d.getVar(prov, False): d.renameVar(prov, provexp) + for prov in rproviders: + val = d.getVar(prov, False) + pkg = prov.replace("PREFERRED_RPROVIDER_", "") + for p in prefixes: + newval = p + "-" + val + + # implement variable keys + localdata = bb.data.createCopy(d) + override = ":virtclass-multilib-" + p + localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) + 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_RPROVIDER_" + p + "-" + pkg) + if not d.getVar(newname, False) and newval != None: + d.setVar(newname, localdata.expand(newval)) + # Avoid future variable key expansion + provexp = d.expand(prov) + if prov != provexp and d.getVar(prov, False): + d.renameVar(prov, provexp) + def translate_provide(prefix, prov): if not prov.startswith("virtual/"): return prefix + "-" + prov |