[PATCH 0/1] gnupg: Read GNUPG_BINDIR from environment variables for nativesdk

[PATCH 0/1] gnupg: Read GNUPG_BINDIR from environment variables for nativesdk

[Robert Yang]

The following changes since commit 53cf1241fa4721ba89955146099749d05c5d7171:

  musl: Ensure that B is clean before configure task is run (2020-01-06 00:24:16 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/gnupg
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/gnupg

Robert Yang (1):
  gnupg: Read GNUPG_BINDIR from environment variables for nativesdk

 meta/recipes-support/gnupg/gnupg_2.2.17.bb | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

-- 
2.7.4

[PATCH 1/1] gnupg: Read GNUPG_BINDIR from environment variables for nativesdk

[Robert Yang]

There is already a relocate.patch for native which is used for reading
GNUPG_BINDIR from environment variables, now also enable it for nativesdk.
Otherwise, command like the following one doesn't work for nativesdk:

$ gpg-connect-agent --homedir ../keys/ reloadagent /bye
gpg-connect-agent: no running gpg-agent - starting '/opt/path/to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent'
gpg-connect-agent: failed to start agent '/opt/path/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/gpg-agent': No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/gnupg/gnupg_2.2.17.bb | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-support/gnupg/gnupg_2.2.17.bb b/meta/recipes-support/gnupg/gnupg_2.2.17.bb
index bb8885f..60a8515 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.17.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.17.bb
@@ -15,9 +15,10 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0003-dirmngr-uses-libgpg-error.patch \
            file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
            file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
+           file://relocate.patch \
            "
-SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
-                                file://relocate.patch"
+
+SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch"
 
 SRC_URI[md5sum] = "1ba2d9b70c377f8e967742064c27a19c"
 SRC_URI[sha256sum] = "afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514"
@@ -60,10 +61,17 @@ 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}
+	create_wrappers ${STAGING_BINDIR_NATIVE}
+}
+
+do_install_append_class-nativesdk() {
+	create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk}
+}
+
+create_wrappers() {
+	for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do
+		create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1
+	done
 }
 
 PACKAGECONFIG ??= "gnutls"
-- 
2.7.4

Re: [PATCH 1/1] gnupg: Read GNUPG_BINDIR from environment variables for nativesdk

[Richard Purdie]

On Mon, 2020-01-06 at 16:26 +0800, Robert Yang wrote:
> There is already a relocate.patch for native which is used for
> reading
> GNUPG_BINDIR from environment variables, now also enable it for
> nativesdk.
> Otherwise, command like the following one doesn't work for nativesdk:

This is a misleading commit message as its also enabled on target in
this patch. Do we need/want this enabled on target?

Cheers,

Richard

Re: [PATCH 1/1] gnupg: Read GNUPG_BINDIR from environment variables for nativesdk

[Robert Yang]

On 1/6/20 5:34 PM, Richard Purdie wrote:
> On Mon, 2020-01-06 at 16:26 +0800, Robert Yang wrote:
>> There is already a relocate.patch for native which is used for
>> reading
>> GNUPG_BINDIR from environment variables, now also enable it for
>> nativesdk.
>> Otherwise, command like the following one doesn't work for nativesdk:
> 
> This is a misleading commit message as its also enabled on target in
> this patch. Do we need/want this enabled on target?

Sorry, I think no, I wrongly enabled it for target, I will send a V2.

// Robert

> 
> Cheers,
> 
> Richard
> 
> 
>