diff options
Diffstat (limited to 'meta/classes/sign_rpm.bbclass')
| -rw-r--r-- | meta/classes/sign_rpm.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index a8ea75faaa..2a08020819 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass | |||
| @@ -22,11 +22,11 @@ RPM_GPG_BACKEND ?= 'local' | |||
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | python () { | 24 | python () { |
| 25 | if d.getVar('RPM_GPG_PASSPHRASE_FILE', True): | 25 | if d.getVar('RPM_GPG_PASSPHRASE_FILE'): |
| 26 | raise_sanity_error('RPM_GPG_PASSPHRASE_FILE is replaced by RPM_GPG_PASSPHRASE', d) | 26 | raise_sanity_error('RPM_GPG_PASSPHRASE_FILE is replaced by RPM_GPG_PASSPHRASE', d) |
| 27 | # Check configuration | 27 | # Check configuration |
| 28 | for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): | 28 | for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): |
| 29 | if not d.getVar(var, True): | 29 | if not d.getVar(var): |
| 30 | 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) |
| 31 | 31 | ||
| 32 | # Set the expected location of the public key | 32 | # Set the expected location of the public key |
| @@ -41,12 +41,12 @@ python sign_rpm () { | |||
| 41 | import glob | 41 | import glob |
| 42 | from oe.gpg_sign import get_signer | 42 | from oe.gpg_sign import get_signer |
| 43 | 43 | ||
| 44 | signer = get_signer(d, d.getVar('RPM_GPG_BACKEND', True)) | 44 | signer = get_signer(d, d.getVar('RPM_GPG_BACKEND')) |
| 45 | rpms = glob.glob(d.getVar('RPM_PKGWRITEDIR', True) + '/*') | 45 | rpms = glob.glob(d.getVar('RPM_PKGWRITEDIR') + '/*') |
| 46 | 46 | ||
| 47 | signer.sign_rpms(rpms, | 47 | signer.sign_rpms(rpms, |
| 48 | d.getVar('RPM_GPG_NAME', True), | 48 | d.getVar('RPM_GPG_NAME'), |
| 49 | d.getVar('RPM_GPG_PASSPHRASE', True)) | 49 | d.getVar('RPM_GPG_PASSPHRASE')) |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | do_package_index[depends] += "signing-keys:do_deploy" | 52 | do_package_index[depends] += "signing-keys:do_deploy" |
