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:03 +0000 |
| commit | 863459e6b565eb6b1a74b78bc01e884ffeac2085 (patch) | |
| tree | 578b2c69cdd3cc094a6c950b55df33bba0a3f8cf /meta/lib/oe | |
| parent | 951d22cb62891c4bc078925c4af8445d7be940e0 (diff) | |
| download | openembedded-core-contrib-863459e6b565eb6b1a74b78bc01e884ffeac2085.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]
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/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 16eb7f83bf..ba61f98909 100644 --- a/meta/lib/oe/gpg_sign.py +++ b/meta/lib/oe/gpg_sign.py @@ -32,6 +32,8 @@ class LocalSigner(object): cmd = self.rpm_bin + " --addsign --define '_gpg_name %s' " % keyid cmd += "--define '_gpg_passphrase %s' " % passphrase + if self.gpg_version > (2,1,): + cmd += "--define '_gpg_sign_cmd_extra_args --pinentry-mode=loopback' " if self.gpg_bin: cmd += "--define '%%__gpg %s' " % self.gpg_bin if self.gpg_path: |