diff options
-rw-r--r-- | meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb (renamed from meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb) | 7 |
3 files changed, 2 insertions, 65 deletions
diff --git a/meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch b/meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch deleted file mode 100644 index 3b4caa2215..0000000000 --- a/meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From f56e59712d8708c74a4cf66d24b5703fc16b22ae Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 1 Sep 2022 11:31:48 -0700 | ||
4 | Subject: [PATCH] configure: Check for request_init API when probing for | ||
5 | libwrap | ||
6 | |||
7 | checking for main() is not right check, since this function is not part | ||
8 | of libwrap but the app. Newer autocof and toolchain may fail | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/cminyard/gensio/pull/48] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 90cfcb6b..1c06d918 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -109,7 +109,7 @@ AC_ARG_WITH(tcp-wrappers, | ||
21 | if test "$tcp_wrappers" != "no" | ||
22 | then | ||
23 | AC_CHECK_HEADERS([tcpd.h]) | ||
24 | - AC_CHECK_LIB(wrap,main) | ||
25 | + AC_CHECK_LIB(wrap,request_init) | ||
26 | fi | ||
27 | |||
28 | AC_ARG_ENABLE([doc], | ||
29 | -- | ||
30 | 2.37.3 | ||
31 | |||
diff --git a/meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch b/meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch deleted file mode 100644 index 93831c380f..0000000000 --- a/meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 823b6754a4d7655480b6e8576a9d0037f842d653 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Luebbe <jlu@pengutronix.de> | ||
3 | Date: Thu, 25 Aug 2022 12:19:16 +0200 | ||
4 | Subject: [PATCH] tools:gensiot: Fix build with musl | ||
5 | |||
6 | According to POSIX getpid() is available in unistd.h, not sys/unistd.h. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/cminyard/gensio/pull/47] | ||
9 | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> | ||
10 | --- | ||
11 | tools/gensiotool.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/tools/gensiotool.c b/tools/gensiotool.c | ||
15 | index cac531bb4b74..ab0bb9583f9f 100644 | ||
16 | --- a/tools/gensiotool.c | ||
17 | +++ b/tools/gensiotool.c | ||
18 | @@ -44,7 +44,7 @@ | ||
19 | #include <signal.h> | ||
20 | #include <errno.h> | ||
21 | #include <sys/types.h> | ||
22 | -#include <sys/unistd.h> | ||
23 | +#include <unistd.h> | ||
24 | #include <syslog.h> | ||
25 | #endif | ||
26 | |||
27 | -- | ||
28 | 2.30.2 | ||
29 | |||
diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb index d6b5f1987e..91450e2c77 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb | |||
@@ -5,12 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ | |||
5 | file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ | 5 | file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRCREV = "b6cd354afe6d5f63bc859c94fd3a455a3cdf0449" | 8 | SRCREV = "d512218c4fa5667d4fe15977d3f15f05591f1f1a" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master \ | 10 | SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" |
11 | file://0001-tools-gensiot-Fix-build-with-musl.patch \ | ||
12 | file://0001-configure-Check-for-request_init-API-when-probing-fo.patch \ | ||
13 | " | ||
14 | 11 | ||
15 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
16 | 13 | ||