diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-11-06 12:20:33 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-06 12:20:33 +0000 |
| commit | a59935fb3a7260e2be7769a783ac907a1d73e699 (patch) | |
| tree | a934d7aeed853a7a01fbba3258beda187b962d08 /bitbake | |
| parent | 87c2b700bedf659b0e54ac16f9638f0461688dc9 (diff) | |
| download | openembedded-core-a59935fb3a7260e2be7769a783ac907a1d73e699.tar.gz | |
bitbake/siggen: Allow siggen code to control final stampfile format
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 9 | ||||
| -rw-r--r-- | bitbake/lib/bb/siggen.py | 3 |
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: fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] if taskname is None: taskname = self.rqdata.runq_task[task] - stampfile = "%s.%s" % (self.rqdata.dataCache.stamp[fn], taskname) + + stampfile = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn], taskname, self.rqdata.runq_hash[task]) + # If the stamp is missing its not current if not os.access(stampfile, os.F_OK): bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s not available\n" % stampfile) @@ -900,9 +902,10 @@ class RunQueue: if iscurrent: fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]] taskname2 = self.rqdata.runq_task[dep] - stampfile2 = "%s.%s" % (self.rqdata.dataCache.stamp[fn2], taskname2) + stampfile2 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], taskname2, self.rqdata.runq_hash[dep]) + stampfile3 = bb.parse.siggen.stampfile(self.rqdata.dataCache.stamp[fn2], taskname2 + "_setscene", self.rqdata.runq_hash[dep]) t2 = get_timestamp(stampfile2) - t3 = get_timestamp(stampfile2 + "_setscene") + t3 = get_timestamp(stampfile3) if t3 and t3 > t2: continue 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): def finalise(self, fn, d, varient): return + def stampfile(self, stampbase, taskname, taskhash): + return "%s.%s" % (stampbase, taskname) + class SignatureGeneratorBasic(SignatureGenerator): """ """ |