aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-05 14:04:59 +0000
committerArmin Kuster <akuster808@gmail.com>2020-02-08 13:30:05 -0800
commit95687be83e716220eb3893b67428f97fd59fc2c5 (patch)
tree442611529bfe2cffb01d67ffb37fddff8bad4019
parent1f5a662176fd174c4793e3e28d1b4e95616b1715 (diff)
downloadbitbake-contrib-95687be83e716220eb3893b67428f97fd59fc2c5.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 27ad9c1d468fba858a4adeb56b605227b415ae0f) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--lib/bb/siggen.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 96807c46c..ffd8fcaf3 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -515,6 +515,10 @@ class SignatureGeneratorUniHashMixIn(object):
if self.setscenetasks and tid not in self.setscenetasks:
return
+ # This can happen if locked sigs are in action. Detect and just abort
+ if taskhash != self.taskhash[tid]:
+ return
+
# Sanity checks
cache_unihash = self._get_unihash(tid, checkkey=taskhash)
if cache_unihash is None: