summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-01 11:54:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-03 08:21:10 +0000
commit235101a662ab7b41532ed1319fd9d1735931e8ca (patch)
tree9d4d4abe739084a474492816abb6d41c270f2a68 /meta
parentbd98ef572df3ed89e9aa0c414a0c622b58659b64 (diff)
downloadpoky-235101a662ab7b41532ed1319fd9d1735931e8ca.tar.gz
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. (From OE-Core rev: 9923392539b1ce6d70f713527373d6bbc03f3021) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/sstatesig.py5
1 files changed, 0 insertions, 5 deletions
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):
162 else: 162 else:
163 return super().get_taskhash(tid, deps, dataCaches) 163 return super().get_taskhash(tid, deps, dataCaches)
164 164
165 # get_taskhash will call get_unihash internally in the parent class, we
166 # need to disable our filter of it whilst this runs else
167 # incorrect hashes can be calculated.
168 self._internal = True
169 h = super().get_taskhash(tid, deps, dataCaches) 165 h = super().get_taskhash(tid, deps, dataCaches)
170 self._internal = False
171 166
172 (mc, _, task, fn) = bb.runqueue.split_tid_mcfn(tid) 167 (mc, _, task, fn) = bb.runqueue.split_tid_mcfn(tid)
173 168