mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: bitbake: Rename allowed multiple provider variable

Browse Source 
In line with the inclusive language migration defined at:

https://wiki.yoctoproject.org/wiki/Inclusive_language

rename:

MULTI_PROVIDER_WHITELIST -> BB_MULTI_PROVIDER_ALLOWED

(Bitbake rev: a09546b725fda13c0279638c7c904110da7bf6cd)

(Bitbake rev: d035435c1a4951a45481867cf932faa4a6f8f936)

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Murray
2022-02-13 16:15:09 -05:00
committed by Richard Purdie
parent 3c971c0400
commit 3ff067647f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
+1 -1
View File
@@ -1054,7 +1054,7 @@ overview of their function and contents.
upstream source, and then locations specified by :term:`MIRRORS` in that upstream source, and then locations specified by :term:`MIRRORS` in that
order. order.
:term:`MULTI_PROVIDER_WHITELIST` :term:`BB_MULTI_PROVIDER_ALLOWED`
Allows you to suppress BitBake warnings caused when building two Allows you to suppress BitBake warnings caused when building two
separate recipes that provide the same output. separate recipes that provide the same output.
bitbake/lib/bb/data_smart.py
+1
View File
@@ -40,6 +40,7 @@ bitbake_renamed_vars = {
"BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS", "BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS",
"BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS",
"BB_SETSCENE_ENFORCE_WHITELIST": "BB_SETSCENE_ENFORCE_IGNORE_TASKS", "BB_SETSCENE_ENFORCE_WHITELIST": "BB_SETSCENE_ENFORCE_IGNORE_TASKS",
"MULTI_PROVIDER_WHITELIST": "BB_MULTI_PROVIDER_ALLOWED",
} }
def infer_caller_details(loginfo, parent = False, varval = True): def infer_caller_details(loginfo, parent = False, varval = True):
bitbake/lib/bb/runqueue.py
+2 -2
View File
@@ -385,7 +385,7 @@ class RunQueueData:
self.rq = rq self.rq = rq
self.warn_multi_bb = False self.warn_multi_bb = False
self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split() self.multi_provider_allowed = (cfgData.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split()
self.setscene_ignore_tasks = get_setscene_enforce_ignore_tasks(cfgData, targets) self.setscene_ignore_tasks = get_setscene_enforce_ignore_tasks(cfgData, targets)
self.setscene_ignore_tasks_checked = False self.setscene_ignore_tasks_checked = False
self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1") self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1")
@@ -1048,7 +1048,7 @@ class RunQueueData:
for prov in prov_list: for prov in prov_list:
if len(prov_list[prov]) < 2: if len(prov_list[prov]) < 2:
continue continue
if prov in self.multi_provider_whitelist: if prov in self.multi_provider_allowed:
continue continue
seen_pn = [] seen_pn = []
# If two versions of the same PN are being built its fatal, we don't support it. # If two versions of the same PN are being built its fatal, we don't support it.