From 7ae68c580cc9ff1e2ba3c65b84cf3a02ebaaaac1 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Wed, 11 Sep 2019 11:32:04 -0700 Subject: 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. (From OE-Core rev: f93bf3bd051923618ce3949d5686fdb8cf998645) Signed-off-by: Jason Wessel Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 e5456dd9b9..689cf8a75e 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" -- cgit 1.2.3-korg