diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 13:49:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:27 +0000 |
commit | 98b3ed1b2e113bdd028dcf22477892ea8cfe007b (patch) | |
tree | 9311d25a78b62db866892345fce92f71b3b875b3 /meta/classes/multilib_global.bbclass | |
parent | 492214104a55ec56cc483c9b045038e355c6af7b (diff) | |
download | poky-98b3ed1b2e113bdd028dcf22477892ea8cfe007b.tar.gz |
meta/scripts: Handle bitbake variable renaming
After other variables were renamed in bitbake, update OE-Core to match.
(From OE-Core rev: 91812ba5a34598e03ad860745707c7cba1ae5d91)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-rw-r--r-- | meta/classes/multilib_global.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index dae015cdaf..ab8ca0e41d 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -137,14 +137,14 @@ def preferred_ml_updates(d): | |||
137 | prov = prov.replace("virtual/", "") | 137 | prov = prov.replace("virtual/", "") |
138 | return "virtual/" + prefix + "-" + prov | 138 | return "virtual/" + prefix + "-" + prov |
139 | 139 | ||
140 | mp = (d.getVar("MULTI_PROVIDER_WHITELIST") or "").split() | 140 | mp = (d.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split() |
141 | extramp = [] | 141 | extramp = [] |
142 | for p in mp: | 142 | for p in mp: |
143 | if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: | 143 | if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: |
144 | continue | 144 | continue |
145 | for pref in prefixes: | 145 | for pref in prefixes: |
146 | extramp.append(translate_provide(pref, p)) | 146 | extramp.append(translate_provide(pref, p)) |
147 | d.setVar("MULTI_PROVIDER_WHITELIST", " ".join(mp + extramp)) | 147 | d.setVar("BB_MULTI_PROVIDER_ALLOWED", " ".join(mp + extramp)) |
148 | 148 | ||
149 | abisafe = (d.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() | 149 | abisafe = (d.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() |
150 | extras = [] | 150 | extras = [] |