From 6eee202b9a87c0580dfa2848428795b465aa412a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 5 Jan 2020 14:04:59 +0000 Subject: 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 (cherry picked from commit 27ad9c1d468fba858a4adeb56b605227b415ae0f) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 4 ++++ 1 file changed, 4 insertions(+) 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): 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: -- cgit v1.2.3-54-g00ecf