diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index a46527505f..b9d89ec082 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -794,7 +794,7 @@ class RunQueue: | |||
794 | continue | 794 | continue |
795 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] | 795 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] |
796 | taskname = self.rqdata.runq_task[task] | 796 | taskname = self.rqdata.runq_task[task] |
797 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], fn, taskname) | 797 | stampfile = bb.build.stampfile(taskname, self.rqdata.dataCache, fn) |
798 | # If the stamp is missing its not current | 798 | # If the stamp is missing its not current |
799 | if not os.access(stampfile, os.F_OK): | 799 | if not os.access(stampfile, os.F_OK): |
800 | del unchecked[task] | 800 | del unchecked[task] |
@@ -815,7 +815,7 @@ class RunQueue: | |||
815 | if task in unchecked: | 815 | if task in unchecked: |
816 | fn = self.taskData.fn_index[self.rqdata.runq_fnid[task]] | 816 | fn = self.taskData.fn_index[self.rqdata.runq_fnid[task]] |
817 | taskname = self.rqdata.runq_task[task] | 817 | taskname = self.rqdata.runq_task[task] |
818 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], fn, taskname) | 818 | stampfile = bb.build.stampfile(taskname, self.rqdata.dataCache, fn) |
819 | iscurrent = True | 819 | iscurrent = True |
820 | 820 | ||
821 | t1 = os.stat(stampfile)[stat.ST_MTIME] | 821 | t1 = os.stat(stampfile)[stat.ST_MTIME] |
@@ -823,7 +823,7 @@ class RunQueue: | |||
823 | if iscurrent: | 823 | if iscurrent: |
824 | fn2 = self.taskData.fn_index[self.rqdata.runq_fnid[dep]] | 824 | fn2 = self.taskData.fn_index[self.rqdata.runq_fnid[dep]] |
825 | taskname2 = self.rqdata.runq_task[dep] | 825 | taskname2 = self.rqdata.runq_task[dep] |
826 | stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], fn2, taskname2) | 826 | stampfile2 = bb.build.stampfile(taskname2, self.rqdata.dataCache, fn2) |
827 | if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): | 827 | if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): |
828 | if dep in notcurrent: | 828 | if dep in notcurrent: |
829 | iscurrent = False | 829 | iscurrent = False |
@@ -875,7 +875,7 @@ class RunQueue: | |||
875 | if taskname is None: | 875 | if taskname is None: |
876 | taskname = self.rqdata.runq_task[task] | 876 | taskname = self.rqdata.runq_task[task] |
877 | 877 | ||
878 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], fn, taskname) | 878 | stampfile = bb.build.stampfile(taskname, self.rqdata.dataCache, fn) |
879 | 879 | ||
880 | # If the stamp is missing its not current | 880 | # If the stamp is missing its not current |
881 | if not os.access(stampfile, os.F_OK): | 881 | if not os.access(stampfile, os.F_OK): |
@@ -896,8 +896,8 @@ class RunQueue: | |||
896 | if iscurrent: | 896 | if iscurrent: |
897 | fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]] | 897 | fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]] |
898 | taskname2 = self.rqdata.runq_task[dep] | 898 | taskname2 = self.rqdata.runq_task[dep] |
899 | stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], fn2, taskname2) | 899 | stampfile2 = bb.build.stampfile(taskname2, self.rqdata.dataCache, fn2) |
900 | stampfile3 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], fn2, taskname2 + "_setscene") | 900 | stampfile3 = bb.build.stampfile(taskname2 + "_setscene", self.rqdata.dataCache, fn2) |
901 | t2 = get_timestamp(stampfile2) | 901 | t2 = get_timestamp(stampfile2) |
902 | t3 = get_timestamp(stampfile3) | 902 | t3 = get_timestamp(stampfile3) |
903 | if t3 and t3 > t2: | 903 | if t3 and t3 > t2: |