diff options
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 26 |
1 files changed, 1 insertions, 25 deletions
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): | |||
| 1795 | 1795 | ||
| 1796 | self.stampcache = {} | 1796 | self.stampcache = {} |
| 1797 | 1797 | ||
| 1798 | initial_covered = self.rq.scenequeue_covered.copy() | ||
| 1799 | |||
| 1800 | # Mark initial buildable tasks | 1798 | # Mark initial buildable tasks |
| 1801 | for tid in self.rqdata.runtaskentries: | 1799 | for tid in self.rqdata.runtaskentries: |
| 1802 | if len(self.rqdata.runtaskentries[tid].depends) == 0: | 1800 | if len(self.rqdata.runtaskentries[tid].depends) == 0: |
| @@ -1820,30 +1818,8 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
| 1820 | 1818 | ||
| 1821 | logger.debug(1, 'Skip list %s', sorted(self.rq.scenequeue_covered)) | 1819 | logger.debug(1, 'Skip list %s', sorted(self.rq.scenequeue_covered)) |
| 1822 | 1820 | ||
| 1823 | def removecoveredtask(tid): | 1821 | for task in self.rq.scenequeue_notcovered: |
| 1824 | (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) | ||
| 1825 | taskname = taskname + '_setscene' | ||
| 1826 | bb.build.del_stamp(taskname, self.rqdata.dataCaches[mc], taskfn) | ||
| 1827 | self.rq.scenequeue_covered.remove(tid) | ||
| 1828 | |||
| 1829 | toremove = self.rq.scenequeue_notcovered | ||
| 1830 | for task in toremove: | ||
| 1831 | logger.debug(1, 'Not skipping task %s', task) | 1822 | logger.debug(1, 'Not skipping task %s', task) |
| 1832 | while toremove: | ||
| 1833 | covered_remove = [] | ||
| 1834 | for task in toremove: | ||
| 1835 | if task in self.rq.scenequeue_covered: | ||
| 1836 | removecoveredtask(task) | ||
| 1837 | for deptask in self.rqdata.runtaskentries[task].depends: | ||
| 1838 | if deptask not in self.rq.scenequeue_covered: | ||
| 1839 | continue | ||
| 1840 | if deptask in toremove or deptask in covered_remove or deptask in initial_covered: | ||
| 1841 | continue | ||
| 1842 | logger.debug(1, 'Task %s depends on task %s so not skipping' % (task, deptask)) | ||
| 1843 | covered_remove.append(deptask) | ||
| 1844 | toremove = covered_remove | ||
| 1845 | |||
| 1846 | logger.debug(1, 'Full skip list %s', self.rq.scenequeue_covered) | ||
| 1847 | 1823 | ||
| 1848 | for mc in self.rqdata.dataCaches: | 1824 | for mc in self.rqdata.dataCaches: |
| 1849 | target_pairs = [] | 1825 | target_pairs = [] |
