summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-22 18:37:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-26 13:09:09 +0000
commit2d678cd3f4746adce9d89b8daa877fd669f2ca2d (patch)
tree7bf521e0f7352b33ce78e39ce938ad0f0cde766b /meta
parent181b9a7ee21ada20150ef6329c728db2d331456a (diff)
downloadpoky-2d678cd3f4746adce9d89b8daa877fd669f2ca2d.tar.gz
gnupg: add a patch to avoid native vs. host gpg-agent clashes
(From OE-Core rev: 04f6e01c1d9c8b53ed43405cdb7d3b8b242a27b6) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch30
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.4.bb2
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 @@
1From 0b97148c3aad0993a9aeb088596fa63a2fec5328 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Jan 2018 18:00:21 +0200
4Subject: [PATCH] configure.ac: use a custom value for the location of
5 gpg-agent socket in the filesystem
6
7This should avoid clashes with the host gpg-agent observed on autobuilders.
8
9Upstream-Status: Inappropriate [oe-core specific, and only for -native]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 382ef1d..0570d7c 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -1818,7 +1818,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
20
21 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
22
23-AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent",
24+AC_DEFINE_UNQUOTED(GPG_AGENT_SOCK_NAME, "S.gpg-agent.yocto-native",
25 [The name of the agent socket])
26 AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra",
27 [The name of the agent socket for remote access])
28--
292.15.1
30
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 \
15 file://0003-dirmngr-uses-libgpg-error.patch \ 15 file://0003-dirmngr-uses-libgpg-error.patch \
16 file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ 16 file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
17 " 17 "
18SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch"
19
18 20
19SRC_URI[md5sum] = "709e5af5bba84d251c520222e720972f" 21SRC_URI[md5sum] = "709e5af5bba84d251c520222e720972f"
20SRC_URI[sha256sum] = "401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec" 22SRC_URI[sha256sum] = "401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec"