diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2017-02-23 12:24:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:08 +0000 |
commit | 70b428f16afee961f3ef646d3edff7965b954035 (patch) | |
tree | ed231d0938c9def7c95b6076946f8f56567a3d63 /meta/lib/oe | |
parent | 7f4278d4726fa68a6d42116430cc46186f09bded (diff) | |
download | poky-70b428f16afee961f3ef646d3edff7965b954035.tar.gz |
lib/oe/gpg_sign: fix rpm signing with gpg > 2.1
We need to check the gpg version and alter its command line options
accordingly.
[YOCTO #11054]
(From OE-Core rev: 44a44b7e582a5a654baf21829d168568481c13d9)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/gpg_sign.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py index 630d312cfc..f7f96c6d5e 100644 --- a/meta/lib/oe/gpg_sign.py +++ b/meta/lib/oe/gpg_sign.py | |||
@@ -32,6 +32,8 @@ class LocalSigner(object): | |||
32 | 32 | ||
33 | cmd = self.rpm_bin + " --addsign --define '_gpg_name %s' " % keyid | 33 | cmd = self.rpm_bin + " --addsign --define '_gpg_name %s' " % keyid |
34 | cmd += "--define '_gpg_passphrase %s' " % passphrase | 34 | cmd += "--define '_gpg_passphrase %s' " % passphrase |
35 | if self.gpg_version > (2,1,): | ||
36 | cmd += "--define '_gpg_sign_cmd_extra_args --pinentry-mode=loopback' " | ||
35 | if self.gpg_bin: | 37 | if self.gpg_bin: |
36 | cmd += "--define '%%__gpg %s' " % self.gpg_bin | 38 | cmd += "--define '%%__gpg %s' " % self.gpg_bin |
37 | if self.gpg_path: | 39 | if self.gpg_path: |