From 3ff067647fc0c56f3dd15d07d70bf3a7a496bf4f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 13 Feb 2022 16:15:09 -0500 Subject: bitbake: bitbake: Rename allowed multiple provider variable 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 Signed-off-by: Richard Purdie --- bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | 2 +- bitbake/lib/bb/data_smart.py | 1 + bitbake/lib/bb/runqueue.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst index 1dc03611bb..7601d15a0e 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst @@ -1054,7 +1054,7 @@ overview of their function and contents. upstream source, and then locations specified by :term:`MIRRORS` in that order. - :term:`MULTI_PROVIDER_WHITELIST` + :term:`BB_MULTI_PROVIDER_ALLOWED` Allows you to suppress BitBake warnings caused when building two separate recipes that provide the same output. diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 2ac7f0c78c..43d59de550 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -40,6 +40,7 @@ bitbake_renamed_vars = { "BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS", "BB_HASHTASK_WHITELIST": "BB_TASKHASH_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): diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 2a0fd2e91c..aedf935476 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -385,7 +385,7 @@ class RunQueueData: self.rq = rq 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_checked = False self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1") @@ -1048,7 +1048,7 @@ class RunQueueData: for prov in prov_list: if len(prov_list[prov]) < 2: continue - if prov in self.multi_provider_whitelist: + if prov in self.multi_provider_allowed: continue seen_pn = [] # If two versions of the same PN are being built its fatal, we don't support it. -- cgit v1.2.3-54-g00ecf