[oe-commits] [openembedded-core] 02/08: test

[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 ce8137bb01fcfa83d9b2fbe0b53db3f6bd533282
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Mar 2 15:52:25 2020 +0000

    test
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/sstatesig.py                | 6 ++++++
 meta/lib/oeqa/selftest/cases/signing.py | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 4fc75a9..61f1931 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object):
         self.unlockedrecipes = { k: "" for k in self.unlockedrecipes }
         self.buildarch = data.getVar('BUILD_ARCH')
         self._internal = False
+        self.tempdebug = bool(data.getVar("TEMPDEBUG"))
+
         pass
 
     def tasks_resolved(self, virtmap, virtpnmap, dataCache):
@@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object):
                 self.lockedhashes[tid] = h_locked
                 self._internal = True
                 unihash = self.get_unihash(tid)
+                uh2 =  self._get_unihash(tid)
                 self._internal = False
                 #bb.warn("Using %s %s %s" % (recipename, task, h))
+                if self.tempdebug and recipename == "ed":
+                    bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid]))
 
                 if h != h_locked and h_locked != unihash:
+                    bb.warn("Mismatch warning")
                     self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s'
                                           % (recipename, task, h, h_locked, var))
 
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index 156400c..58f7efa 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase):
 
         feature = 'require %s\n' % locked_sigs_file
         feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n'
+        feature += 'TEMPDEBUG = "1"\n'
         self.write_config(feature)
 
         # Build a locked recipe
@@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase):
             extradebug = runCmd('cat bitbake-cookerdaemon.log').output
             extradebug += bitbake(test_recipe + " -S none").output
             extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output
+            feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4()
+            write_file(recipe_append_path, feature)
             ret2 = bitbake(test_recipe)
             found_warn2 = re.search(patt, ret2.output)
             extradebug += "\nFound %s\n\n" % str(found_warn2)

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