mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
gpg_sign.py: fix signing of rpm files using gpg
This means a) calling rpmkeys and rpmsign instead of rpm b) instructing gpg to run non-interactively; otherwise on my machine it pops up windows requesting a key passphrase (From OE-Core rev: f82f270df2da59702026721612563aea57cd77eb) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f72bc777fa
commit
5a3e1290cb
@@ -11,7 +11,7 @@ class LocalSigner(object):
|
||||
bb.utils.which(os.getenv('PATH'), 'gpg')
|
||||
self.gpg_path = d.getVar('GPG_PATH')
|
||||
self.gpg_version = self.get_gpg_version()
|
||||
self.rpm_bin = bb.utils.which(os.getenv('PATH'), "rpm")
|
||||
self.rpm_bin = bb.utils.which(os.getenv('PATH'), "rpmsign")
|
||||
|
||||
def export_pubkey(self, output_file, keyid, armor=True):
|
||||
"""Export GPG public key to a file"""
|
||||
@@ -31,9 +31,10 @@ class LocalSigner(object):
|
||||
"""Sign RPM files"""
|
||||
|
||||
cmd = self.rpm_bin + " --addsign --define '_gpg_name %s' " % keyid
|
||||
cmd += "--define '_gpg_passphrase %s' " % passphrase
|
||||
gpg_args = '--batch --passphrase=%s' % passphrase
|
||||
if self.gpg_version > (2,1,):
|
||||
cmd += "--define '_gpg_sign_cmd_extra_args --pinentry-mode=loopback' "
|
||||
gpg_args += ' --pinentry-mode=loopback'
|
||||
cmd += "--define '_gpg_sign_cmd_extra_args %s' " % gpg_args
|
||||
if self.gpg_bin:
|
||||
cmd += "--define '%%__gpg %s' " % self.gpg_bin
|
||||
if self.gpg_path:
|
||||
|
||||
Reference in New Issue
Block a user