]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstatesig: Remove workaround for bitbake taskhash bug
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 1 Nov 2020 11:54:20 +0000 (11:54 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 3 Nov 2020 08:20:41 +0000 (08:20 +0000)
When trying to lock an individual signature, we see the checksum calculations
of dependent tasks failing. The fix is to remove a bad optimisation within
bitbake but with the removed, we need to remove some bogus code with
OE-Core's sstatesig code too.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/sstatesig.py

index 64fb84ec9248c46b880167512d49135e74e57653..4ea29cbdfc3cd45dcc6dba53ceb61c254a7f54dd 100644 (file)
@@ -162,12 +162,7 @@ class SignatureGeneratorOEBasicHashMixIn(object):
             else:
                 return super().get_taskhash(tid, deps, dataCaches)
 
-        # get_taskhash will call get_unihash internally in the parent class, we
-        # need to disable our filter of it whilst this runs else
-        # incorrect hashes can be calculated.
-        self._internal = True
         h = super().get_taskhash(tid, deps, dataCaches)
-        self._internal = False
 
         (mc, _, task, fn) = bb.runqueue.split_tid_mcfn(tid)