diff options
Diffstat (limited to 'meta/classes/sign_rpm.bbclass')
| -rw-r--r-- | meta/classes/sign_rpm.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index c21e3f09af..a8ea75faaa 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass @@ -1,8 +1,8 @@ # Class for generating signed RPM packages. # # Configuration variables used by this class: -# RPM_GPG_PASSPHRASE_FILE -# Path to a file containing the passphrase of the signing key. +# RPM_GPG_PASSPHRASE +# 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_BACKEND @@ -22,8 +22,10 @@ RPM_GPG_BACKEND ?= 'local' python () { + if d.getVar('RPM_GPG_PASSPHRASE_FILE', True): + raise_sanity_error('RPM_GPG_PASSPHRASE_FILE is replaced by RPM_GPG_PASSPHRASE', d) # Check configuration - for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE_FILE'): + for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): if not d.getVar(var, True): raise_sanity_error("You need to define %s in the config" % var, d) @@ -44,7 +46,7 @@ python sign_rpm () { signer.sign_rpms(rpms, d.getVar('RPM_GPG_NAME', True), - d.getVar('RPM_GPG_PASSPHRASE_FILE', True)) + d.getVar('RPM_GPG_PASSPHRASE', True)) } do_package_index[depends] += "signing-keys:do_deploy" |