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 bfb16b4f6e..16420b87a4 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -829,7 +829,7 @@ class RunQueue: | |||
829 | continue | 829 | continue |
830 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] | 830 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] |
831 | taskname = self.rqdata.runq_task[task] | 831 | taskname = self.rqdata.runq_task[task] |
832 | stampfile = "%s.%s" % (self.rqdata.dataCache.stamp[fn], taskname) | 832 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], fn, taskname) |
833 | # If the stamp is missing its not current | 833 | # If the stamp is missing its not current |
834 | if not os.access(stampfile, os.F_OK): | 834 | if not os.access(stampfile, os.F_OK): |
835 | del unchecked[task] | 835 | del unchecked[task] |
@@ -850,7 +850,7 @@ class RunQueue: | |||
850 | if task in unchecked: | 850 | if task in unchecked: |
851 | fn = self.taskData.fn_index[self.rqdata.runq_fnid[task]] | 851 | fn = self.taskData.fn_index[self.rqdata.runq_fnid[task]] |
852 | taskname = self.rqdata.runq_task[task] | 852 | taskname = self.rqdata.runq_task[task] |
853 | stampfile = "%s.%s" % (self.rqdata.dataCache.stamp[fn], taskname) | 853 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], fn, taskname) |
854 | iscurrent = True | 854 | iscurrent = True |
855 | 855 | ||
856 | t1 = os.stat(stampfile)[stat.ST_MTIME] | 856 | t1 = os.stat(stampfile)[stat.ST_MTIME] |
@@ -858,7 +858,7 @@ class RunQueue: | |||
858 | if iscurrent: | 858 | if iscurrent: |
859 | fn2 = self.taskData.fn_index[self.rqdata.runq_fnid[dep]] | 859 | fn2 = self.taskData.fn_index[self.rqdata.runq_fnid[dep]] |
860 | taskname2 = self.rqdata.runq_task[dep] | 860 | taskname2 = self.rqdata.runq_task[dep] |
861 | stampfile2 = "%s.%s" % (self.rqdata.dataCache.stamp[fn2], taskname2) | 861 | stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], fn2, taskname2) |
862 | if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): | 862 | if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): |
863 | if dep in notcurrent: | 863 | if dep in notcurrent: |
864 | iscurrent = False | 864 | iscurrent = False |
@@ -910,7 +910,7 @@ class RunQueue: | |||
910 | if taskname is None: | 910 | if taskname is None: |
911 | taskname = self.rqdata.runq_task[task] | 911 | taskname = self.rqdata.runq_task[task] |
912 | 912 | ||
913 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], taskname, self.rqdata.runq_hash[task]) | 913 | stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], fn, taskname) |
914 | 914 | ||
915 | # If the stamp is missing its not current | 915 | # If the stamp is missing its not current |
916 | if not os.access(stampfile, os.F_OK): | 916 | if not os.access(stampfile, os.F_OK): |
@@ -931,8 +931,8 @@ class RunQueue: | |||
931 | if iscurrent: | 931 | if iscurrent: |
932 | fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]] | 932 | fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]] |
933 | taskname2 = self.rqdata.runq_task[dep] | 933 | taskname2 = self.rqdata.runq_task[dep] |
934 | stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], taskname2, self.rqdata.runq_hash[dep]) | 934 | stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], fn2, taskname2) |
935 | stampfile3 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], taskname2 + "_setscene", self.rqdata.runq_hash[dep]) | 935 | stampfile3 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], fn2, taskname2 + "_setscene") |
936 | t2 = get_timestamp(stampfile2) | 936 | t2 = get_timestamp(stampfile2) |
937 | t3 = get_timestamp(stampfile3) | 937 | t3 = get_timestamp(stampfile3) |
938 | if t3 and t3 > t2: | 938 | if t3 and t3 > t2: |