summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 8ae3fe85f1..2a0fd2e91c 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -386,8 +386,8 @@ class RunQueueData:
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_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split()
389 self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData, targets) 389 self.setscene_ignore_tasks = get_setscene_enforce_ignore_tasks(cfgData, targets)
390 self.setscenewhitelist_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")
392 self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter() 392 self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter()
393 393
@@ -2107,9 +2107,9 @@ class RunQueueExecute:
2107 if task is not None: 2107 if task is not None:
2108 (mc, fn, taskname, taskfn) = split_tid_mcfn(task) 2108 (mc, fn, taskname, taskfn) = split_tid_mcfn(task)
2109 2109
2110 if self.rqdata.setscenewhitelist is not None: 2110 if self.rqdata.setscene_ignore_tasks is not None:
2111 if self.check_setscenewhitelist(task): 2111 if self.check_setscene_ignore_tasks(task):
2112 self.task_fail(task, "setscene whitelist") 2112 self.task_fail(task, "setscene ignore_tasks")
2113 return True 2113 return True
2114 2114
2115 if task in self.tasks_covered: 2115 if task in self.tasks_covered:
@@ -2501,11 +2501,11 @@ class RunQueueExecute:
2501 self.scenequeue_updatecounters(task) 2501 self.scenequeue_updatecounters(task)
2502 2502
2503 def sq_check_taskfail(self, task): 2503 def sq_check_taskfail(self, task):
2504 if self.rqdata.setscenewhitelist is not None: 2504 if self.rqdata.setscene_ignore_tasks is not None:
2505 realtask = task.split('_setscene')[0] 2505 realtask = task.split('_setscene')[0]
2506 (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask) 2506 (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask)
2507 pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn] 2507 pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
2508 if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist): 2508 if not check_setscene_enforce_ignore_tasks(pn, taskname, self.rqdata.setscene_ignore_tasks):
2509 logger.error('Task %s.%s failed' % (pn, taskname + "_setscene")) 2509 logger.error('Task %s.%s failed' % (pn, taskname + "_setscene"))
2510 self.rq.state = runQueueCleanUp 2510 self.rq.state = runQueueCleanUp
2511 2511
@@ -2568,8 +2568,8 @@ class RunQueueExecute:
2568 #bb.note("Task %s: " % task + str(taskdepdata).replace("], ", "],\n")) 2568 #bb.note("Task %s: " % task + str(taskdepdata).replace("], ", "],\n"))
2569 return taskdepdata 2569 return taskdepdata
2570 2570
2571 def check_setscenewhitelist(self, tid): 2571 def check_setscene_ignore_tasks(self, tid):
2572 # Check task that is going to run against the whitelist 2572 # Check task that is going to run against the ignore tasks list
2573 (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) 2573 (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
2574 # Ignore covered tasks 2574 # Ignore covered tasks
2575 if tid in self.tasks_covered: 2575 if tid in self.tasks_covered:
@@ -2583,7 +2583,7 @@ class RunQueueExecute:
2583 return False 2583 return False
2584 2584
2585 pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn] 2585 pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
2586 if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist): 2586 if not check_setscene_enforce_ignore_tasks(pn, taskname, self.rqdata.setscene_ignore_tasks):
2587 if tid in self.rqdata.runq_setscene_tids: 2587 if tid in self.rqdata.runq_setscene_tids:
2588 msg = ['Task %s.%s attempted to execute unexpectedly and should have been setscened' % (pn, taskname)] 2588 msg = ['Task %s.%s attempted to execute unexpectedly and should have been setscened' % (pn, taskname)]
2589 else: 2589 else:
@@ -3070,12 +3070,12 @@ class runQueuePipe():
3070 print("Warning, worker left partial message: %s" % self.queue) 3070 print("Warning, worker left partial message: %s" % self.queue)
3071 self.input.close() 3071 self.input.close()
3072 3072
3073def get_setscene_enforce_whitelist(d, targets): 3073def get_setscene_enforce_ignore_tasks(d, targets):
3074 if d.getVar('BB_SETSCENE_ENFORCE') != '1': 3074 if d.getVar('BB_SETSCENE_ENFORCE') != '1':
3075 return None 3075 return None
3076 whitelist = (d.getVar("BB_SETSCENE_ENFORCE_WHITELIST") or "").split() 3076 ignore_tasks = (d.getVar("BB_SETSCENE_ENFORCE_IGNORE_TASKS") or "").split()
3077 outlist = [] 3077 outlist = []
3078 for item in whitelist[:]: 3078 for item in ignore_tasks[:]:
3079 if item.startswith('%:'): 3079 if item.startswith('%:'):
3080 for (mc, target, task, fn) in targets: 3080 for (mc, target, task, fn) in targets:
3081 outlist.append(target + ':' + item.split(':')[1]) 3081 outlist.append(target + ':' + item.split(':')[1])
@@ -3083,12 +3083,12 @@ def get_setscene_enforce_whitelist(d, targets):
3083 outlist.append(item) 3083 outlist.append(item)
3084 return outlist 3084 return outlist
3085 3085
3086def check_setscene_enforce_whitelist(pn, taskname, whitelist): 3086def check_setscene_enforce_ignore_tasks(pn, taskname, ignore_tasks):
3087 import fnmatch 3087 import fnmatch
3088 if whitelist is not None: 3088 if ignore_tasks is not None:
3089 item = '%s:%s' % (pn, taskname) 3089 item = '%s:%s' % (pn, taskname)
3090 for whitelist_item in whitelist: 3090 for ignore_tasks in ignore_tasks:
3091 if fnmatch.fnmatch(item, whitelist_item): 3091 if fnmatch.fnmatch(item, ignore_tasks):
3092 return True 3092 return True
3093 return False 3093 return False
3094 return True 3094 return True