diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-01 11:53:57 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-03 08:21:10 +0000 |
| commit | 72060138fa41ce0cdb2d22ef41c3482c8e6fc505 (patch) | |
| tree | a1739ab125fad239a4caa73d0e0550ff67edd996 /bitbake | |
| parent | d0152bd6f5238894eb25d823aa6c9bc8602a396a (diff) | |
| download | poky-72060138fa41ce0cdb2d22ef41c3482c8e6fc505.tar.gz | |
bitbake: siggen: Remove broken optimisation
When a single signature is locked, dependent task checksum calculations
fail. This in turn is because get_unihash cannot be cached correctly
by this function. Remove that has turned out to be a poor optimisation
to avoid that bug.
(Bitbake rev: 7ae2b73d131491ab5bf09fd6055e1fdb67a560c6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/siggen.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 86e0e16f39..0ac3952466 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
| @@ -311,13 +311,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
| 311 | 311 | ||
| 312 | data = self.basehash[tid] | 312 | data = self.basehash[tid] |
| 313 | for dep in self.runtaskdeps[tid]: | 313 | for dep in self.runtaskdeps[tid]: |
| 314 | if dep in self.unihash: | 314 | data = data + self.get_unihash(dep) |
| 315 | if self.unihash[dep] is None: | ||
| 316 | data = data + self.taskhash[dep] | ||
| 317 | else: | ||
| 318 | data = data + self.unihash[dep] | ||
| 319 | else: | ||
| 320 | data = data + self.get_unihash(dep) | ||
| 321 | 315 | ||
| 322 | for (f, cs) in self.file_checksum_values[tid]: | 316 | for (f, cs) in self.file_checksum_values[tid]: |
| 323 | if cs: | 317 | if cs: |
