From 9923392539b1ce6d70f713527373d6bbc03f3021 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Nov 2020 11:54:20 +0000 Subject: sstatesig: Remove workaround for bitbake taskhash bug 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 --- meta/lib/oe/sstatesig.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 64fb84ec92..4ea29cbdfc 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -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) -- cgit 1.2.3-korg