From 72060138fa41ce0cdb2d22ef41c3482c8e6fc505 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Nov 2020 11:53:57 +0000 Subject: bitbake: siggen: Remove broken optimisation When a single signature is locked, dependent task checksum calculations fail. This in turn is because get_unihash cannot be cached correctly by this function. Remove that has turned out to be a poor optimisation to avoid that bug. (Bitbake rev: 7ae2b73d131491ab5bf09fd6055e1fdb67a560c6) Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 86e0e16f39..0ac3952466 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -311,13 +311,7 @@ class SignatureGeneratorBasic(SignatureGenerator): data = self.basehash[tid] for dep in self.runtaskdeps[tid]: - if dep in self.unihash: - if self.unihash[dep] is None: - data = data + self.taskhash[dep] - else: - data = data + self.unihash[dep] - else: - data = data + self.get_unihash(dep) + data = data + self.get_unihash(dep) for (f, cs) in self.file_checksum_values[tid]: if cs: -- cgit v1.2.3-54-g00ecf