mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
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:
committed by
Richard Purdie
parent
05d7e0db5d
commit
3e5c5fe330
+6
-18
@@ -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"""
|
||||
|
||||
Reference in New Issue
Block a user