diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-22 18:37:26 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-26 13:07:20 +0000 |
| commit | 04f6e01c1d9c8b53ed43405cdb7d3b8b242a27b6 (patch) | |
| tree | fc06052ba84d9427123bb38855e50390898b5227 | |
| parent | e71ecc6a288d1b552248e6f05e8694eb96b5af5c (diff) | |
| download | openembedded-core-04f6e01c1d9c8b53ed43405cdb7d3b8b242a27b6.tar.gz openembedded-core-04f6e01c1d9c8b53ed43405cdb7d3b8b242a27b6.tar.bz2 openembedded-core-04f6e01c1d9c8b53ed43405cdb7d3b8b242a27b6.zip | |
gnupg: add a patch to avoid native vs. host gpg-agent clashes
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.2.4.bb | 2 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch new file mode 100644 index 0000000000..3e3a64df2f --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -0,0 +1,30 @@ +From 0b97148c3aad0993a9aeb088596fa63a2fec5328 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 22 Jan 2018 18:00:21 +0200 +Subject: [PATCH] configure.ac: use a custom value for the location of + gpg-agent socket in the filesystem + +This should avoid clashes with the host gpg-agent observed on autobuilders. + +Upstream-Status: Inappropriate [oe-core specific, and only for -native] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 382ef1d..0570d7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1818,7 +1818,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", + + AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) + +-AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent", ++AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent.yocto-native", + [The name of the agent socket]) + AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra", + [The name of the agent socket for remote access]) +-- +2.15.1 + diff --git a/meta/recipes-support/gnupg/gnupg_2.2.4.bb b/meta/recipes-support/gnupg/gnupg_2.2.4.bb index e15bcf298a..d3f1a8f4c4 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.4.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.4.bb @@ -15,6 +15,8 @@ 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 \ " +SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch" + SRC_URI[md5sum] = "709e5af5bba84d251c520222e720972f" SRC_URI[sha256sum] = "401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec" |