From 97f07ca394dc002133f9b38936c0beca9f6912f0 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 28 Nov 2022 14:09:42 +0800 Subject: gensio: upgrade 2.5.2 -> 2.6.1 0001-configure-Check-for-request_init-API-when-probing-fo.patch 0001-tools-gensiot-Fix-build-with-musl.patch removed since they're included in 2.6.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...heck-for-request_init-API-when-probing-fo.patch | 31 ---------------------- .../0001-tools-gensiot-Fix-build-with-musl.patch | 29 -------------------- .../recipes-connectivity/gensio/gensio_2.5.2.bb | 27 ------------------- .../recipes-connectivity/gensio/gensio_2.6.1.bb | 24 +++++++++++++++++ 4 files changed, 24 insertions(+), 87 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/gensio/files/0001-configure-Check-for-request_init-API-when-probing-fo.patch delete mode 100644 meta-oe/recipes-connectivity/gensio/files/0001-tools-gensiot-Fix-build-with-musl.patch delete mode 100644 meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb create mode 100644 meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb (limited to 'meta-oe') 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 @@ -From f56e59712d8708c74a4cf66d24b5703fc16b22ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 1 Sep 2022 11:31:48 -0700 -Subject: [PATCH] configure: Check for request_init API when probing for - libwrap - -checking for main() is not right check, since this function is not part -of libwrap but the app. Newer autocof and toolchain may fail - -Upstream-Status: Submitted [https://github.com/cminyard/gensio/pull/48] -Signed-off-by: Khem Raj ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 90cfcb6b..1c06d918 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,7 +109,7 @@ AC_ARG_WITH(tcp-wrappers, - if test "$tcp_wrappers" != "no" - then - AC_CHECK_HEADERS([tcpd.h]) -- AC_CHECK_LIB(wrap,main) -+ AC_CHECK_LIB(wrap,request_init) - fi - - AC_ARG_ENABLE([doc], --- -2.37.3 - 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 @@ -From 823b6754a4d7655480b6e8576a9d0037f842d653 Mon Sep 17 00:00:00 2001 -From: Jan Luebbe -Date: Thu, 25 Aug 2022 12:19:16 +0200 -Subject: [PATCH] tools:gensiot: Fix build with musl - -According to POSIX getpid() is available in unistd.h, not sys/unistd.h. - -Upstream-Status: Submitted [https://github.com/cminyard/gensio/pull/47] -Signed-off-by: Jan Luebbe ---- - tools/gensiotool.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/gensiotool.c b/tools/gensiotool.c -index cac531bb4b74..ab0bb9583f9f 100644 ---- a/tools/gensiotool.c -+++ b/tools/gensiotool.c -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - #include - #endif - --- -2.30.2 - diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb deleted file mode 100644 index d6b5f1987e..0000000000 --- a/meta-oe/recipes-connectivity/gensio/gensio_2.5.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" -HOMEPAGE = "https://github.com/cminyard/gensio" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ - file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ - " - -SRCREV = "b6cd354afe6d5f63bc859c94fd3a455a3cdf0449" - -SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master \ - file://0001-tools-gensiot-Fix-build-with-musl.patch \ - file://0001-configure-Check-for-request_init-API-when-probing-fo.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools - -PACKAGECONFIG ??= "openssl tcp-wrappers" - -PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}${prefix},--without-openssl, openssl" -PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" -PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" - -EXTRA_OECONF = "--without-python" - -RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb new file mode 100644 index 0000000000..91450e2c77 --- /dev/null +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "d512218c4fa5667d4fe15977d3f15f05591f1f1a" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}${prefix},--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS:${PN} += "bash" -- cgit v1.2.3-54-g00ecf