summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnupg
diff options
context:
space:
mode:
authorGuðni Már Gilbert <gudni.m.g@gmail.com>2025-01-25 15:32:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-27 15:47:10 +0000
commit174e7c82291032a6d315ea3d700687468a3b916b (patch)
tree3f7424345d40fa19dda7ec950367f070f5bd3926 /meta/recipes-support/gnupg
parente8304fa3f542469c87301065caf546583bd9b95c (diff)
downloadpoky-174e7c82291032a6d315ea3d700687468a3b916b.tar.gz
gnupg: remove obsolete patch
Remove a patch which is already merged in v2.5.1 See for reference: https://github.com/gpg/gnupg/commit/1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f https://dev.gnupg.org/T7193 (From OE-Core rev: 79c10b2ad17bacec024427693eb025659f455a20) Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnupg')
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch33
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.5.2.bb1
2 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
deleted file mode 100644
index ec99f4b10c..0000000000
--- a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 81c222ea179ef73fcae4b50c56342bdad4787a28 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 22 Aug 2024 15:31:16 +0800
4Subject: [PATCH] fix compile failure with musl
5
6```
7../../gnupg-2.5.0/scd/app.c:379:3: error: implicit declaration of function 'write'; did you mean 'fwrite'? [-Wimplicit-function-declaration]
8 379 | write (card_list_lock.notify_pipe[1], "", 1);
9 | ^~~~~
10 | fwrite
11```
12To access the Posix low level file interface such as open, read,
13write and close, should include <unistd.h>.
14
15Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f]
16
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18---
19 scd/app.c | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/scd/app.c b/scd/app.c
23index ba7bb23..7d41e53 100644
24--- a/scd/app.c
25+++ b/scd/app.c
26@@ -24,6 +24,7 @@
27 #include <string.h>
28 #include <unistd.h>
29 #include <npth.h>
30+#include <unistd.h>
31
32 #ifndef HAVE_W32_SYSTEM
33 #include <fcntl.h> /* F_SETFD F_GETFL F_SETFL O_NONBLOCK fcntl(2) */
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.2.bb b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
index 64c63e31ce..8e87382f12 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.2.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
@@ -18,7 +18,6 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
18 file://0002-use-pkgconfig-instead-of-npth-config.patch \ 18 file://0002-use-pkgconfig-instead-of-npth-config.patch \
19 file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ 19 file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
20 file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ 20 file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
21 file://0001-fix-compile-failure-with-musl.patch \
22 " 21 "
23SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ 22SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
24 file://relocate.patch" 23 file://relocate.patch"