[oe-commits] [openembedded-core] 02/02: sstatesig: Avoid resetting taskhash within siggen for locked sigs

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b55313c2406537d5e7d6a5db1443ad3ed98fd390
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Jan 2 16:37:58 2020 +0000

    sstatesig: Avoid resetting taskhash within siggen for locked sigs
    
    Since get_unihash uses taskhash as a key internally, changing it means
    different bebahour when locked sigs are active verses not active. Under
    corner cases this leads to a signature mismatch.
    
    Avoid this by by adding a wrapper for the place its externally exposed
    and then not changing the internals.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/sstatesig.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 32a5005..5ade975 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -206,6 +206,11 @@ class SignatureGeneratorOEBasicHashMixIn(object):
         #bb.warn("%s %s %s" % (recipename, task, h))
         return h
 
+    def get_stampfile_hash(self, tid):
+        if tid in self.lockedhashes and self.lockedhashes[tid]:
+            return self.lockedhashes[tid]
+        return super().get_stampfile_hash(tid)
+
     def get_unihash(self, tid):
         if tid in self.lockedhashes and self.lockedhashes[tid] and not self._internal:
             return self.lockedhashes[tid]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.