summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-11-06 12:20:33 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-06 12:20:33 +0000
commita59935fb3a7260e2be7769a783ac907a1d73e699 (patch)
treea934d7aeed853a7a01fbba3258beda187b962d08
parent87c2b700bedf659b0e54ac16f9638f0461688dc9 (diff)
downloadpoky-a59935fb3a7260e2be7769a783ac907a1d73e699.tar.gz
bitbake/siggen: Allow siggen code to control final stampfile format
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/runqueue.py9
-rw-r--r--bitbake/lib/bb/siggen.py3
2 files changed, 9 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 0a319d2c42..848dccac34 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -880,7 +880,9 @@ class RunQueue:
880 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] 880 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]]
881 if taskname is None: 881 if taskname is None:
882 taskname = self.rqdata.runq_task[task] 882 taskname = self.rqdata.runq_task[task]
883 stampfile = "%s.%s" % (self.rqdata.dataCache.stamp[fn], taskname) 883
884 stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], taskname, self.rqdata.runq_hash[task])
885
884 # If the stamp is missing its not current 886 # If the stamp is missing its not current
885 if not os.access(stampfile, os.F_OK): 887 if not os.access(stampfile, os.F_OK):
886 bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s not available\n" % stampfile) 888 bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s not available\n" % stampfile)
@@ -900,9 +902,10 @@ class RunQueue:
900 if iscurrent: 902 if iscurrent:
901 fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]] 903 fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]]
902 taskname2 = self.rqdata.runq_task[dep] 904 taskname2 = self.rqdata.runq_task[dep]
903 stampfile2 = "%s.%s" % (self.rqdata.dataCache.stamp[fn2], taskname2) 905 stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], taskname2, self.rqdata.runq_hash[dep])
906 stampfile3 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], taskname2 + "_setscene", self.rqdata.runq_hash[dep])
904 t2 = get_timestamp(stampfile2) 907 t2 = get_timestamp(stampfile2)
905 t3 = get_timestamp(stampfile2 + "_setscene") 908 t3 = get_timestamp(stampfile3)
906 if t3 and t3 > t2: 909 if t3 and t3 > t2:
907 continue 910 continue
908 if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): 911 if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist):
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 1a84796759..ffbab396c1 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -32,6 +32,9 @@ class SignatureGenerator(object):
32 def finalise(self, fn, d, varient): 32 def finalise(self, fn, d, varient):
33 return 33 return
34 34
35 def stampfile(self, stampbase, taskname, taskhash):
36 return "%s.%s" % (stampbase, taskname)
37
35class SignatureGeneratorBasic(SignatureGenerator): 38class SignatureGeneratorBasic(SignatureGenerator):
36 """ 39 """
37 """ 40 """