aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/meta/signing-keys.bb
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-02-10 16:15:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 22:55:11 +0000
commite2412294b6b1d3a80ee97a0706613349edc51d33 (patch)
tree39a06af3040d1dee21c55de1c9f0572324d39bf4 /meta/recipes-core/meta/signing-keys.bb
parentce653694a87fd77d79ec3d28ed3365a2c8e57ad6 (diff)
downloadopenembedded-core-contrib-e2412294b6b1d3a80ee97a0706613349edc51d33.tar.gz
openembedded-core-contrib-e2412294b6b1d3a80ee97a0706613349edc51d33.tar.bz2
openembedded-core-contrib-e2412294b6b1d3a80ee97a0706613349edc51d33.zip
sign_rpm.bbclass: do not store key details in signer instance
Refactor the LocalSigner class. Do not store keyid or passphrase file in the signer object as they are only needed for some of the methods. For example, the newly added verify() method does not need any key parameters and export_pubkey only uses keyid. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/meta/signing-keys.bb')
-rw-r--r--meta/recipes-core/meta/signing-keys.bb16
1 files changed, 6 insertions, 10 deletions
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb
index d7aa79d49f..d7763c664e 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -26,18 +26,14 @@ python do_export_public_keys () {
if d.getVar("RPM_SIGN_PACKAGES", True):
# Export public key of the rpm signing key
- signer = get_signer(d,
- d.getVar('RPM_GPG_BACKEND', True),
- d.getVar('RPM_GPG_NAME', True),
- d.getVar('RPM_GPG_PASSPHRASE_FILE', True))
- signer.export_pubkey(d.getVar('RPM_GPG_PUBKEY', True))
+ signer = get_signer(d, d.getVar('RPM_GPG_BACKEND', True))
+ signer.export_pubkey(d.getVar('RPM_GPG_PUBKEY', True),
+ d.getVar('RPM_GPG_NAME', True))
if d.getVar('PACKAGE_FEED_SIGN', True) == '1':
# Export public key of the feed signing key
- signer = get_signer(d,
- d.getVar('PACKAGE_FEED_GPG_BACKEND', True),
- d.getVar('PACKAGE_FEED_GPG_NAME', True),
- d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True))
- signer.export_pubkey(d.getVar('PACKAGE_FEED_GPG_PUBKEY', True))
+ signer = get_signer(d, d.getVar('PACKAGE_FEED_GPG_BACKEND', True))
+ signer.export_pubkey(d.getVar('PACKAGE_FEED_GPG_PUBKEY', True),
+ d.getVar('PACKAGE_FEED_GPG_NAME', True))
}
addtask do_export_public_keys before do_build