summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-26 14:11:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-30 17:23:35 +0100
commitba0ff38cabc7091bc8c6287faabede7331c4ab08 (patch)
tree2c6452fffe8103c2fec0a65a910cc03bbe52e75a
parent7ab4808e0aa4b5ebeb16031afcba55b590518fc5 (diff)
downloadpoky-ba0ff38cabc7091bc8c6287faabede7331c4ab08.tar.gz
bitbake: siggen: Avoid writing misleading sigdata files
Use the unihash in the output filename of sigdata files else the contents of stamp directories is misleading. Write the unihash into the singature to make it clear what happened. (Bitbake rev: feb01ee54d3706fe93768f332054c7532f7209e4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 6207cbca30..90f0926f25 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -268,7 +268,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
268 sigfile = stampbase 268 sigfile = stampbase
269 referencestamp = runtime[11:] 269 referencestamp = runtime[11:]
270 elif runtime and tid in self.taskhash: 270 elif runtime and tid in self.taskhash:
271 sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[tid] 271 sigfile = stampbase + "." + task + ".sigdata" + "." + self.get_unihash(tid)
272 else: 272 else:
273 sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[tid] 273 sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[tid]
274 274
@@ -296,6 +296,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
296 for dep in data['runtaskdeps']: 296 for dep in data['runtaskdeps']:
297 data['runtaskhashes'][dep] = self.get_unihash(dep) 297 data['runtaskhashes'][dep] = self.get_unihash(dep)
298 data['taskhash'] = self.taskhash[tid] 298 data['taskhash'] = self.taskhash[tid]
299 data['unihash'] = self.get_unihash(tid)
299 300
300 taint = self.read_taint(fn, task, referencestamp) 301 taint = self.read_taint(fn, task, referencestamp)
301 if taint: 302 if taint: