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. (From OE-Core rev: 4a8a74c62836a20610daf029d4cec0b3087758b2) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
05d7e0db5d
commit
3e5c5fe330
|
@ -1,8 +1,8 @@
|
||||||
# Class for generating signed RPM packages.
|
# Class for generating signed RPM packages.
|
||||||
#
|
#
|
||||||
# Configuration variables used by this class:
|
# Configuration variables used by this class:
|
||||||
# RPM_GPG_PASSPHRASE_FILE
|
# RPM_GPG_PASSPHRASE
|
||||||
# Path to a file containing the passphrase of the signing key.
|
# The passphrase of the signing key.
|
||||||
# RPM_GPG_NAME
|
# RPM_GPG_NAME
|
||||||
# Name of the key to sign with. May be key id or key name.
|
# Name of the key to sign with. May be key id or key name.
|
||||||
# RPM_GPG_BACKEND
|
# RPM_GPG_BACKEND
|
||||||
|
@ -22,8 +22,10 @@ RPM_GPG_BACKEND ?= 'local'
|
||||||
|
|
||||||
|
|
||||||
python () {
|
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
|
# 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):
|
if not d.getVar(var, True):
|
||||||
raise_sanity_error("You need to define %s in the config" % var, d)
|
raise_sanity_error("You need to define %s in the config" % var, d)
|
||||||
|
|
||||||
|
@ -44,7 +46,7 @@ python sign_rpm () {
|
||||||
|
|
||||||
signer.sign_rpms(rpms,
|
signer.sign_rpms(rpms,
|
||||||
d.getVar('RPM_GPG_NAME', True),
|
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"
|
do_package_index[depends] += "signing-keys:do_deploy"
|
||||||
|
|
|
@ -26,32 +26,20 @@ class LocalSigner(object):
|
||||||
raise bb.build.FuncFailed('Failed to export gpg public key (%s): %s' %
|
raise bb.build.FuncFailed('Failed to export gpg public key (%s): %s' %
|
||||||
(keyid, output))
|
(keyid, output))
|
||||||
|
|
||||||
def sign_rpms(self, files, keyid, passphrase_file):
|
def sign_rpms(self, files, keyid, passphrase):
|
||||||
"""Sign RPM files"""
|
"""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:
|
if self.gpg_bin:
|
||||||
cmd += "--define '%%__gpg %s' " % self.gpg_bin
|
cmd += "--define '%%__gpg %s' " % self.gpg_bin
|
||||||
if self.gpg_path:
|
if self.gpg_path:
|
||||||
cmd += "--define '_gpg_path %s' " % self.gpg_path
|
cmd += "--define '_gpg_path %s' " % self.gpg_path
|
||||||
cmd += ' '.join(files)
|
cmd += ' '.join(files)
|
||||||
|
|
||||||
# Need to use pexpect for feeding the passphrase
|
status, output = oe.utils.getstatusoutput(cmd)
|
||||||
proc = pexpect.spawn(cmd)
|
if status:
|
||||||
try:
|
raise bb.build.FuncFailed("Failed to sign RPM packages: %s" % output)
|
||||||
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")
|
|
||||||
|
|
||||||
|
|
||||||
def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None, armor=True):
|
def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None, armor=True):
|
||||||
"""Create a detached signature of a file"""
|
"""Create a detached signature of a file"""
|
||||||
|
|
Loading…
Reference in New Issue