diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/sign_package_feed.bbclass | 7 | ||||
| -rw-r--r-- | meta/classes/sign_rpm.bbclass | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/meta/classes/sign_package_feed.bbclass b/meta/classes/sign_package_feed.bbclass index 8877d905f7..4263810028 100644 --- a/meta/classes/sign_package_feed.bbclass +++ b/meta/classes/sign_package_feed.bbclass @@ -21,4 +21,11 @@ python () { 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) + + # Set expected location of the public key + d.setVar('PACKAGE_FEED_GPG_PUBKEY', + os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'), + 'PACKAGE-FEED-GPG-PUBKEY')) } + +do_package_index[depends] += "signing-keys:do_export_public_keys" diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index 4da17633a7..f0c3dc9be3 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass @@ -5,9 +5,6 @@ # Path to a file containing the passphrase of the signing key. # RPM_GPG_NAME # Name of the key to sign with. May be key id or key name. -# RPM_GPG_PUBKEY -# Path to a file containing the public key (in "armor" format) -# corresponding the signing key. # GPG_BIN # Optional variable for specifying the gpg binary/wrapper to use for # signing. @@ -24,6 +21,10 @@ python () { for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE_FILE'): if not d.getVar(var, True): raise_sanity_error("You need to define %s in the config" % var, d) + + # Set the expected location of the public key + d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'), + 'RPM-GPG-PUBKEY')) } @@ -68,3 +69,5 @@ python sign_rpm () { if rpmsign_wrapper(d, rpms, rpm_gpg_passphrase, rpm_gpg_name) != 0: raise bb.build.FuncFailed("RPM signing failed") } + +do_package_index[depends] += "signing-keys:do_export_public_keys" |