diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 1 | ||||
-rw-r--r-- | 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. | |||
1054 | upstream source, and then locations specified by :term:`MIRRORS` in that | 1054 | upstream source, and then locations specified by :term:`MIRRORS` in that |
1055 | order. | 1055 | order. |
1056 | 1056 | ||
1057 | :term:`MULTI_PROVIDER_WHITELIST` | 1057 | :term:`BB_MULTI_PROVIDER_ALLOWED` |
1058 | Allows you to suppress BitBake warnings caused when building two | 1058 | Allows you to suppress BitBake warnings caused when building two |
1059 | separate recipes that provide the same output. | 1059 | separate recipes that provide the same output. |
1060 | 1060 | ||
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 = { | |||
40 | "BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS", | 40 | "BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS", |
41 | "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", | 41 | "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", |
42 | "BB_SETSCENE_ENFORCE_WHITELIST": "BB_SETSCENE_ENFORCE_IGNORE_TASKS", | 42 | "BB_SETSCENE_ENFORCE_WHITELIST": "BB_SETSCENE_ENFORCE_IGNORE_TASKS", |
43 | "MULTI_PROVIDER_WHITELIST": "BB_MULTI_PROVIDER_ALLOWED", | ||
43 | } | 44 | } |
44 | 45 | ||
45 | def infer_caller_details(loginfo, parent = False, varval = True): | 46 | 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: | |||
385 | self.rq = rq | 385 | self.rq = rq |
386 | self.warn_multi_bb = False | 386 | self.warn_multi_bb = False |
387 | 387 | ||
388 | self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split() | 388 | self.multi_provider_allowed = (cfgData.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split() |
389 | self.setscene_ignore_tasks = get_setscene_enforce_ignore_tasks(cfgData, targets) | 389 | self.setscene_ignore_tasks = get_setscene_enforce_ignore_tasks(cfgData, targets) |
390 | self.setscene_ignore_tasks_checked = False | 390 | self.setscene_ignore_tasks_checked = False |
391 | self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1") | 391 | self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1") |
@@ -1048,7 +1048,7 @@ class RunQueueData: | |||
1048 | for prov in prov_list: | 1048 | for prov in prov_list: |
1049 | if len(prov_list[prov]) < 2: | 1049 | if len(prov_list[prov]) < 2: |
1050 | continue | 1050 | continue |
1051 | if prov in self.multi_provider_whitelist: | 1051 | if prov in self.multi_provider_allowed: |
1052 | continue | 1052 | continue |
1053 | seen_pn = [] | 1053 | seen_pn = [] |
1054 | # If two versions of the same PN are being built its fatal, we don't support it. | 1054 | # If two versions of the same PN are being built its fatal, we don't support it. |