[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4821/8267] lib/oe/gpg_sign: fix rpm signing with gpg > 2.1

[Emmanuele Bassi <ebassi src gnome org>]

commit 70b428f16afee961f3ef646d3edff7965b954035
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Thu Feb 23 12:24:20 2017 +0200

    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>

 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 630d312..f7f96c6 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: