diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
1 files changed, 2 insertions, 2 deletions
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. |