From 76f64f94b355ea438b89bda969b604436c0ea71b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 6 Jul 2019 14:12:55 +0100 Subject: bitbake: runqueue: Remove now uneeded code With the removal of the setcene verify code, this additional code block is also now unneeded since tasks can't be forced at this point in the code any move. This effectively reverts f21910157d873c030b149c4cdc5b57c5062ab5a6. (Bitbake rev: 4514fe4f045d595cc9b938f9326f66f2b3e99f71) Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 19af73cb3c..6ac9fb1678 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1795,8 +1795,6 @@ class RunQueueExecuteTasks(RunQueueExecute): self.stampcache = {} - initial_covered = self.rq.scenequeue_covered.copy() - # Mark initial buildable tasks for tid in self.rqdata.runtaskentries: if len(self.rqdata.runtaskentries[tid].depends) == 0: @@ -1820,30 +1818,8 @@ class RunQueueExecuteTasks(RunQueueExecute): logger.debug(1, 'Skip list %s', sorted(self.rq.scenequeue_covered)) - def removecoveredtask(tid): - (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) - taskname = taskname + '_setscene' - bb.build.del_stamp(taskname, self.rqdata.dataCaches[mc], taskfn) - self.rq.scenequeue_covered.remove(tid) - - toremove = self.rq.scenequeue_notcovered - for task in toremove: + for task in self.rq.scenequeue_notcovered: logger.debug(1, 'Not skipping task %s', task) - while toremove: - covered_remove = [] - for task in toremove: - if task in self.rq.scenequeue_covered: - removecoveredtask(task) - for deptask in self.rqdata.runtaskentries[task].depends: - if deptask not in self.rq.scenequeue_covered: - continue - if deptask in toremove or deptask in covered_remove or deptask in initial_covered: - continue - logger.debug(1, 'Task %s depends on task %s so not skipping' % (task, deptask)) - covered_remove.append(deptask) - toremove = covered_remove - - logger.debug(1, 'Full skip list %s', self.rq.scenequeue_covered) for mc in self.rqdata.dataCaches: target_pairs = [] -- cgit v1.2.3-54-g00ecf