Skip to contentSkip to conversation

gnupg: Extend -native wrapper to fix gpgme-native's gpgconf problems

PATCH New Jason Wessel 1 participant 1 message Sep 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/recipes-support/gnupg/gnupg_2.2.17.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-support/gnupg/gnupg_2.2.17.bb +3 -0
index e5456dd9b9..689cf8a75e 100644
@@ -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"
Signature · 1 line
2.23.0