[oe-commits] [openembedded-core] 23/58: gnupg: Extend -native wrapper to fix gpgme-native's gpgconf problems

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f93bf3bd051923618ce3949d5686fdb8cf998645
Author: Jason Wessel <jason.wessel at windriver.com>
AuthorDate: Wed Sep 11 11:32:04 2019 -0700

    gnupg: Extend -native wrapper to fix gpgme-native's gpgconf problems
    
    The gpg commit signing in ostree-native doesn't work properly when
    running from sstate.  The ostree-native is linked with gpgme-native's
    libraries, which have calls into gpg.
    
    Ultimately it turned out the problem was that gpgme calls gpgconf and
    some of the other gnupg-native binaries directly.  Not all the
    binaries have a wrapper which sets the environment variable GNUPG_BIN.
    Without this wrapper these binaries it gets the path assignment from
    the original compilation which causes a fault when running from sstate
    in a new tmp directory because these paths will not exist.
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-support/gnupg/gnupg_2.2.17.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-support/gnupg/gnupg_2.2.17.bb b/meta/recipes-support/gnupg/gnupg_2.2.17.bb
index e5456dd..689cf8a 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.17.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.17.bb
@@ -46,6 +46,9 @@ do_install_append() {
 
 do_install_append_class-native() {
 	create_wrapper ${D}${bindir}/gpg2 GNUPG_BINDIR=${STAGING_BINDIR_NATIVE}
+	create_wrapper ${D}${bindir}/gpgconf GNUPG_BINDIR=${STAGING_BINDIR_NATIVE}
+	create_wrapper ${D}${bindir}/gpg-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE}
+	create_wrapper ${D}${bindir}/gpg-connect-agent GNUPG_BINDIR=${STAGING_BINDIR_NATIVE}
 }
 
 PACKAGECONFIG ??= "gnutls"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.