bison: prevent checking for textstyle.
PATCH 1/3 bison: prevent checking for textstyle.
From: Daniel McGregor <[email protected]>
Bison's autoconf is also very good at finding textstyle, force it to not find it unless it's explictly enabled.
--- meta/recipes-devtools/bison/bison_3.7.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-devtools/bison/bison_3.7.6.bb +3 -1
@@ -33,7 +33,9 @@ PACKAGECONFIG[textstyle] = "--with-libtextstyle-prefix,--without-libtextstyle-pr CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', ' \ ac_cv_header_readline_history_h=no \ ac_cv_header_readline_readline_h=no \ - gl_cv_lib_readline=no', d)}" + gl_cv_lib_readline=no', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'textstyle', '', ' \ + ac_cv_libtextstyle=no', d)}" # The automatic m4 path detection gets confused, so force the right value acpaths = "-I ./m4"
Signature · 1 line
2.31.1
PATCH 2/3 Validate shared state against list of keys
From: Daniel McGregor <[email protected]>
Allow a user to validate sstate objects against a list of keys, instead of just any known key in the user's keychain.
--- meta/classes/sstate.bbclass | 5 ++++- meta/lib/oe/gpg_sign.py | 27 ++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-)
meta/classes/sstate.bbclass +4 -1
@@ -114,6 +114,9 @@ SSTATE_SIG_KEY ?= "" SSTATE_SIG_PASSPHRASE ?= "" # Whether to verify the GnUPG signatures when extracting sstate archives SSTATE_VERIFY_SIG ?= "0" +# List of signatures to consider valid. +SSTATE_VALID_SIGS ??= "" +SSTATE_VALID_SIGS[vardepvalue] = "" SSTATE_HASHEQUIV_METHOD ?= "oe.sstatesig.OEOuthashBasic" SSTATE_HASHEQUIV_METHOD[doc] = "The fully-qualified function used to calculate \
@@ -370,7 +373,7 @@ def sstate_installpkg(ss, d): bb.warn("No signature file for sstate package %s, skipping acceleration..." % sstatepkg) return False signer = get_signer(d, 'local') - if not signer.verify(sstatepkg + '.sig'): + if not signer.verify(sstatepkg + '.sig', d.getVar("SSTATE_VALID_SIGS")): bb.warn("Cannot verify signature on sstate package %s, skipping acceleration..." % sstatepkg) return False
meta/lib/oe/gpg_sign.py +22 -5
@@ -109,16 +109,33 @@ class LocalSigner(object): bb.fatal("Could not get gpg version: %s" % e) - def verify(self, sig_file): + def verify(self, sig_file, valid_sigs = ''): """Verify signature""" - cmd = self.gpg_cmd + ["--verify", "--no-permission-warning"] + cmd = self.gpg_cmd + ["--verify", "--no-permission-warning", "--status-fd", "1"] if self.gpg_path: cmd += ["--homedir", self.gpg_path] cmd += [sig_file] - status = subprocess.call(cmd) - ret = False if status else True - return ret + status = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + # Valid if any key matches if unspecified + if not valid_sigs: + ret = False if status.returncode else True + return ret + + import re + goodsigs = [] + sigre = re.compile('^\[GNUPG:\] GOODSIG (\S+)\s(.*)$') + for l in status.stdout.decode("utf-8").splitlines(): + s = sigre.match(l) + if s: + goodsigs += [s.group(1)] + + for sig in valid_sigs.split(): + if sig in goodsigs: + return True + if len(goodsigs): + bb.warn('No accepted signatures found. Good signatures found: %s.' % ' '.join(goodsigs)) + return False def get_signer(d, backend):
Signature · 1 line
2.31.1
PATCH 3/3 bitbake.conf: Add gpg-agent as a host tool
In reply to Dan McGregorFrom: Daniel McGregor <[email protected]>
If gpg is used, it will find the first gpg agent in the path, this may lead to issues where gpg comes from the host, and the agent comes from a gnupg-native due to package signing. The versions being out of sync causes gpg to fail.
--- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
@@ -498,7 +498,7 @@ HOSTTOOLS += " \ HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" # Link to these if present -HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" +HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo" # Temporary add few more detected in bitbake world HOSTTOOLS_NONFATAL += "join nl size yes zcat"
Signature · 1 line
2.31.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCH 2/3] Validate shared state against list of keys
Quoted 54 lines · Dan McGregor via lists.openembedded.org
From: Daniel McGregor <[email protected]>
Allow a user to validate sstate objects against a list of keys, instead of just any known key in the user's keychain.
Signed-off-by Daniel McGregor <[email protected]>--- meta/classes/sstate.bbclass | 5 ++++- meta/lib/oe/gpg_sign.py | 27 ++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-)meta/classes/sstate.bbclass +4
-1@@ -114,6 +114,9 @@ SSTATE_SIG_KEY ?= "" SSTATE_SIG_PASSPHRASE ?= "" # Whether to verify the GnUPG signatures when extracting sstate archives SSTATE_VERIFY_SIG ?= "0" +# List of signatures to consider valid. +SSTATE_VALID_SIGS ??= "" +SSTATE_VALID_SIGS[vardepvalue] = "" SSTATE_HASHEQUIV_METHOD ?= "oe.sstatesig.OEOuthashBasic" SSTATE_HASHEQUIV_METHOD[doc] = "The fully-qualified function used to calculate \@@ -370,7 +373,7 @@ def sstate_installpkg(ss, d): bb.warn("No signature file for sstate package %s, skipping acceleration..." % sstatepkg) return False signer = get_signer(d, 'local') - if not signer.verify(sstatepkg + '.sig'): + if not signer.verify(sstatepkg + '.sig', d.getVar("SSTATE_VALID_SIGS")): bb.warn("Cannot verify signature on sstate package %s, skipping acceleration..." % sstatepkg) return Falsemeta/lib/oe/gpg_sign.py +2
-4@@ -109,16 +109,33 @@ class LocalSigner(object): bb.fatal("Could not get gpg version: %s" % e) - def verify(self, sig_file): + def verify(self, sig_file, valid_sigs = ''): """Verify signature""" - cmd = self.gpg_cmd + ["--verify", "--no-permission-warning"] + cmd = self.gpg_cmd + ["--verify", "--no-permission-warning", "--status-fd", "1"] if self.gpg_path: cmd += ["--homedir", self.gpg_path] cmd += [sig_file] - status = subprocess.call(cmd) - ret = False if status else True
meta/lib/oe/gpg_sign.py class LocalSigner(object): · line 127
Quoted 10 lines
meta/lib/oe/gpg_sign.py +9
-1- return ret + status = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + # Valid if any key matches if unspecified + if not valid_sigs: + ret = False if status.returncode else True + return ret + + import re + goodsigs = [] + sigre = re.compile('^\[GNUPG:\] GOODSIG (\S+)\s(.*)$')
Missed the deprecation warning here; don't want to introduce new issues. Hence v2 for just this patch.
Quoted 26 lines
meta/lib/oe/gpg_sign.py +11
-1+ for l in status.stdout.decode("utf-8").splitlines(): + s = sigre.match(l) + if s: + goodsigs += [s.group(1)] + + for sig in valid_sigs.split(): + if sig in goodsigs: + return True + if len(goodsigs): + bb.warn('No accepted signatures found. Good signatures found: %s.' % ' '.join(goodsigs)) + return False def get_signer(d, backend): --2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156883): https://lists.openembedded.org/g/openembedded-core/message/156883
Mute This Topic: https://lists.openembedded.org/mt/86265247/3617261
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-