diff options
Diffstat (limited to 'meta/classes')
-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 @@ | |||
1 | # Class for generating signed RPM packages. | 1 | # Class for generating signed RPM packages. |
2 | # | 2 | # |
3 | # Configuration variables used by this class: | 3 | # Configuration variables used by this class: |
4 | # RPM_GPG_PASSPHRASE_FILE | 4 | # RPM_GPG_PASSPHRASE |
5 | # Path to a file containing the passphrase of the signing key. | 5 | # The passphrase of the signing key. |
6 | # RPM_GPG_NAME | 6 | # RPM_GPG_NAME |
7 | # Name of the key to sign with. May be key id or key name. | 7 | # Name of the key to sign with. May be key id or key name. |
8 | # RPM_GPG_BACKEND | 8 | # RPM_GPG_BACKEND |
@@ -22,8 +22,10 @@ RPM_GPG_BACKEND ?= 'local' | |||
22 | 22 | ||
23 | 23 | ||
24 | python () { | 24 | python () { |
25 | if d.getVar('RPM_GPG_PASSPHRASE_FILE', True): | ||
26 | raise_sanity_error('RPM_GPG_PASSPHRASE_FILE is replaced by RPM_GPG_PASSPHRASE', d) | ||
25 | # Check configuration | 27 | # Check configuration |
26 | for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE_FILE'): | 28 | for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): |
27 | if not d.getVar(var, True): | 29 | if not d.getVar(var, True): |
28 | raise_sanity_error("You need to define %s in the config" % var, d) | 30 | raise_sanity_error("You need to define %s in the config" % var, d) |
29 | 31 | ||
@@ -44,7 +46,7 @@ python sign_rpm () { | |||
44 | 46 | ||
45 | signer.sign_rpms(rpms, | 47 | signer.sign_rpms(rpms, |
46 | d.getVar('RPM_GPG_NAME', True), | 48 | d.getVar('RPM_GPG_NAME', True), |
47 | d.getVar('RPM_GPG_PASSPHRASE_FILE', True)) | 49 | d.getVar('RPM_GPG_PASSPHRASE', True)) |
48 | } | 50 | } |
49 | 51 | ||
50 | do_package_index[depends] += "signing-keys:do_deploy" | 52 | do_package_index[depends] += "signing-keys:do_deploy" |