diff options
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index dae015cdaf..6095d278dd 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -1,3 +1,9 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + def preferred_ml_updates(d): # If any of PREFERRED_PROVIDER, PREFERRED_RPROVIDER, REQUIRED_VERSION # or PREFERRED_VERSION are set, we need to mirror these variables in @@ -39,6 +45,9 @@ def preferred_ml_updates(d): override = ":virtclass-multilib-" + p localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) if "-canadian-" in pkg: + newtune = localdata.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + p, False) + if newtune: + localdata.setVar("DEFAULTTUNE", newtune) newname = localdata.expand(v) else: newname = localdata.expand(v).replace(version_str, version_str + p + '-') @@ -137,14 +146,14 @@ def preferred_ml_updates(d): prov = prov.replace("virtual/", "") return "virtual/" + prefix + "-" + prov - mp = (d.getVar("MULTI_PROVIDER_WHITELIST") or "").split() + mp = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") 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 for pref in prefixes: extramp.append(translate_provide(pref, p)) - d.setVar("MULTI_PROVIDER_WHITELIST", " ".join(mp + extramp)) + d.setVar("BB_MULTI_PROVIDER_ALLOWED", " ".join(mp + extramp)) abisafe = (d.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() extras = [] @@ -186,6 +195,7 @@ python multilib_virtclass_handler_global () { # from a copy of the datastore localdata = bb.data.createCopy(d) localdata.delVar("KERNEL_VERSION") + localdata.delVar("KERNEL_VERSION_PKG_NAME") variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() |