[bitbake-devel,03/26] runqueue: Remove now uneeded code

Submitted by Richard Purdie on July 10, 2019, 11:53 p.m. | Patch ID: 162952

Details

Message ID 20190710235420.23825-3-richard.purdie@linuxfoundation.org
State Accepted
Commit 4514fe4f045d595cc9b938f9326f66f2b3e99f71
Headers show

Commit Message

Richard Purdie July 10, 2019, 11:53 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 lib/bb/runqueue.py | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

Patch hide | download patch | download mbox

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 19af73cb3c..6ac9fb1678 100644
--- a/lib/bb/runqueue.py
+++ b/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 = []