diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2017-03-03 14:37:27 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-14 15:21:07 +0000 |
| commit | 6c08cf277a8a804a69ca9e173d0eeb51f0eb09bc (patch) | |
| tree | aea35275870fcad7b205791990b016be0e3a9597 /meta/lib | |
| parent | 35c95af7a8330618b2d047af8f5c2623da85c91d (diff) | |
| download | poky-6c08cf277a8a804a69ca9e173d0eeb51f0eb09bc.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: 863459e6b565eb6b1a74b78bc01e884ffeac2085)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 44a44b7e582a5a654baf21829d168568481c13d9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -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 16eb7f83bf..ba61f98909 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: |