diff options
| -rw-r--r-- | meta/classes/sign_rpm.bbclass | 10 | ||||
| -rw-r--r-- | meta/lib/oe/gpg_sign.py | 24 |
2 files changed, 12 insertions, 22 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" diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py index e738397880..b83ee86728 100644 --- a/meta/lib/oe/gpg_sign.py +++ b/meta/lib/oe/gpg_sign.py @@ -26,32 +26,20 @@ class LocalSigner(object): raise bb.build.FuncFailed('Failed to export gpg public key (%s): %s' % (keyid, output)) - def sign_rpms(self, files, keyid, passphrase_file): + def sign_rpms(self, files, keyid, passphrase): """Sign RPM files""" - import pexpect - cmd = self.rpm_bin + " --addsign --define '_gpg_name %s' " % keyid + cmd = self.rpm_bin + " --addsign --define '_gpg_name %s' " % keyid + cmd += "--define '_gpg_passphrase %s' " % passphrase if self.gpg_bin: cmd += "--define '%%__gpg %s' " % self.gpg_bin if self.gpg_path: cmd += "--define '_gpg_path %s' " % self.gpg_path cmd += ' '.join(files) - # Need to use pexpect for feeding the passphrase - proc = pexpect.spawn(cmd) - try: - proc.expect_exact('Enter pass phrase:', timeout=15) - with open(passphrase_file) as fobj: - proc.sendline(fobj.readline().rstrip('\n')) - proc.expect(pexpect.EOF, timeout=900) - proc.close() - except pexpect.TIMEOUT as err: - bb.error('rpmsign timeout: %s' % err) - proc.terminate() - if os.WEXITSTATUS(proc.status) or not os.WIFEXITED(proc.status): - bb.error('rpmsign failed: %s' % proc.before.strip()) - raise bb.build.FuncFailed("Failed to sign RPM packages") - + status, output = oe.utils.getstatusoutput(cmd) + if status: + raise bb.build.FuncFailed("Failed to sign RPM packages: %s" % output) def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None, armor=True): """Create a detached signature of a file""" |