sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sign_package_feed: add feed signature type 

Signing package feeds will default to ascii armored signatures (ASC) the
other option being binary (BIN). This is for both rpm and ipk backends.

(From OE-Core rev: 862a3892feb2628282e1d6f2e4498a7a3bd60cbf)

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ioan-Adrian Ratiu 2016-03-10 12:03:00 +02:00 committed by Richard Purdie
parent 42f612c42a
commit 81d58d6b24
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/classes/sign_package_feed.bbclass
View File

@ -10,6 +10,12 @@
# Optional variable for specifying the backend to use for signing.
# Currently the only available option is 'local', i.e. local signing
# on the build host.
# PACKAGE_FEED_GPG_SIGNATURE_TYPE
# Optional variable for specifying the type of gpg signature, can be:
# 1. Ascii armored (ASC), default if not set
# 2. Binary (BIN)
# This variable is only available for IPK feeds. It is ignored on
# other packaging backends.
# GPG_BIN
# Optional variable for specifying the gpg binary/wrapper to use for
# signing.
@ -20,13 +26,17 @@ inherit sanity
PACKAGE_FEED_SIGN = '1'
PACKAGE_FEED_GPG_BACKEND ?= 'local'
PACKAGE_FEED_GPG_SIGNATURE_TYPE ?= 'ASC'
python () {
# Check sanity of configuration
for var in ('PACKAGE_FEED_GPG_NAME', 'PACKAGE_FEED_GPG_PASSPHRASE_FILE'):
if not d.getVar(var, True):
raise_sanity_error("You need to define %s in the config" % var, d)
sigtype = d.getVar("PACKAGE_FEED_GPG_SIGNATURE_TYPE", True)
if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
raise_sanity_error("Bad value for PACKAGE_FEED_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype)
}
do_package_index[depends] += "signing-keys:do_deploy"

10
meta/lib/oe/package_manager.py
View File

@ -141,9 +141,12 @@ class RpmIndexer(Indexer):
# Sign repomd
if signer:
for repomd in repomd_files:
feed_sig_type = self.d.getVar('PACKAGE_FEED_GPG_SIGNATURE_TYPE', True)
is_ascii_sig = (feed_sig_type.upper() != "BIN")
signer.detach_sign(repomd,
self.d.getVar('PACKAGE_FEED_GPG_NAME', True),
self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True))
self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True),
armor=is_ascii_sig)
class OpkgIndexer(Indexer):
@ -192,10 +195,13 @@ class OpkgIndexer(Indexer):
bb.fatal('%s' % ('\n'.join(result)))
if signer:
feed_sig_type = self.d.getVar('PACKAGE_FEED_GPG_SIGNATURE_TYPE', True)
is_ascii_sig = (feed_sig_type.upper() != "BIN")
for f in index_sign_files:
signer.detach_sign(f,
self.d.getVar('PACKAGE_FEED_GPG_NAME', True),
self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True))
self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True),
armor=is_ascii_sig)
class DpkgIndexer(Indexer):