summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-03-21 02:25:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 14:24:25 +0000
commit4a8a74c62836a20610daf029d4cec0b3087758b2 (patch)
tree193cd11f64581ba45a8174dd81d8d1ea41a89d3b /meta/lib/oe
parent3cd4f96e94d8756d332b13215ce3ac2e1eaddee7 (diff)
downloadopenembedded-core-4a8a74c62836a20610daf029d4cec0b3087758b2.tar.gz
openembedded-core-4a8a74c62836a20610daf029d4cec0b3087758b2.tar.bz2
openembedded-core-4a8a74c62836a20610daf029d4cec0b3087758b2.zip
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/lib/oe')
-rw-r--r--meta/lib/oe/gpg_sign.py24
1 files changed, 6 insertions, 18 deletions
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"""