diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-03-21 02:25:50 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 14:24:25 +0000 |
| commit | 4a8a74c62836a20610daf029d4cec0b3087758b2 (patch) | |
| tree | 193cd11f64581ba45a8174dd81d8d1ea41a89d3b /meta/classes/sign_rpm.bbclass | |
| parent | 3cd4f96e94d8756d332b13215ce3ac2e1eaddee7 (diff) | |
| download | openembedded-core-4a8a74c62836a20610daf029d4cec0b3087758b2.tar.gz | |
gpg_sign.py: get rid of pexpect
The python-expect is not installed on the distro such as Ubuntu by
default, and we can get rid of it.
Use RPM_GPG_PASSPHRASE to replace of RPM_GPG_PASSPHRASE_FILE which is
more straightforward.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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" |