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 12:54:19 +0000 |
| commit | 44a44b7e582a5a654baf21829d168568481c13d9 (patch) | |
| tree | f8b2bbd806edf5e717bce25cd6d8e8e4b75af300 | |
| parent | a00a362e3dc18ba04230cbbd6f91264e5d76f40d (diff) | |
| download | openembedded-core-44a44b7e582a5a654baf21829d168568481c13d9.tar.gz openembedded-core-44a44b7e582a5a654baf21829d168568481c13d9.tar.bz2 openembedded-core-44a44b7e582a5a654baf21829d168568481c13d9.zip | |
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>
| -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): 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: |