diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-06 14:12:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 10:28:12 +0100 |
commit | 76f64f94b355ea438b89bda969b604436c0ea71b (patch) | |
tree | a86ddd2672ff9d69d9696be708bec5c1614d7098 /bitbake | |
parent | 3911e74101f68a9672cd14fe71b3141890d3b9cf (diff) | |
download | poky-76f64f94b355ea438b89bda969b604436c0ea71b.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-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 = [] |