Skip to contentSkip to conversation

lib/oe/gpg_sign.py: Fix gpg verification

PATCH New Dan McGregor 1 participant 2 messages May 18, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lib/oe/gpg_sign.py: Fix gpg verification

From: Daniel McGregor <[email protected]>

A stray space made it into the command for verifying gpg signatures. This caused verification to fail, at least on my host. Removing the space makes it work as expected.

---
 meta/lib/oe/gpg_sign.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/gpg_sign.py +1 -1
index 7634d7ef1d..492f096eaa 100644
@@ -111,7 +111,7 @@ class LocalSigner(object):
 
     def verify(self, sig_file):
         """Verify signature"""
-        cmd = self.gpg_cmd + [" --verify", "--no-permission-warning"]
+        cmd = self.gpg_cmd + ["--verify", "--no-permission-warning"]
         if self.gpg_path:
             cmd += ["--homedir", self.gpg_path]
 
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/2 sstate: Ignore sstate signing key

From: Daniel McGregor <[email protected]>

What key is used to sign sstate artefacts should not affect the hash of the object, otherwise everyone would need to use the same signing key.

---
 meta/classes/sstate.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/sstate.bbclass +2 -0
index 1a6e9962f9..3a3f7cc24b 100644
@@ -706,6 +706,8 @@ def sstate_package(ss, d):
 
     return
 
+sstate_package[vardepsexclude] += "SSTATE_SIG_KEY"
+
 def pstaging_fetch(sstatefetch, d):
     import bb.fetch2
 
Signature · 1 line
2.31.1