diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-05 14:04:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-11 23:02:14 +0000 |
commit | 6eee202b9a87c0580dfa2848428795b465aa412a (patch) | |
tree | 6fdd041658d1b5e11eeb92218116fef2b74209a4 /bitbake/lib | |
parent | 57a4bcc6bf111593d20bcf78fbaee2b53fefa4ad (diff) | |
download | poky-6eee202b9a87c0580dfa2848428795b465aa412a.tar.gz |
bitbake: siggen: Avoid cache mismatch issues with locked sigs
If locked sigs are in use this function makes little sense, need to
avoid generating mismatch warnings.
(Bitbake rev: 95687be83e716220eb3893b67428f97fd59fc2c5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 27ad9c1d468fba858a4adeb56b605227b415ae0f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 96807c46cd..ffd8fcaf36 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -515,6 +515,10 @@ class SignatureGeneratorUniHashMixIn(object): | |||
515 | if self.setscenetasks and tid not in self.setscenetasks: | 515 | if self.setscenetasks and tid not in self.setscenetasks: |
516 | return | 516 | return |
517 | 517 | ||
518 | # This can happen if locked sigs are in action. Detect and just abort | ||
519 | if taskhash != self.taskhash[tid]: | ||
520 | return | ||
521 | |||
518 | # Sanity checks | 522 | # Sanity checks |
519 | cache_unihash = self._get_unihash(tid, checkkey=taskhash) | 523 | cache_unihash = self._get_unihash(tid, checkkey=taskhash) |
520 | if cache_unihash is None: | 524 | if cache_unihash is None: |