diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-06 13:00:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-08 20:18:47 +0000 |
commit | 41f8760dd8a8ac388389bc17dbc5e0ae0f64bf57 (patch) | |
tree | a830c6975638a452f1bb49187a933f9162dd00b9 /meta/recipes-extended/minicom | |
parent | d8f974004ac5a3518c4fc88c4eded4ad23fa98fd (diff) | |
download | openembedded-core-41f8760dd8a8ac388389bc17dbc5e0ae0f64bf57.tar.gz |
minicom: Upgrade 2.7.1 -> 2.8
* Update the url to use .bz2 instead of .gz compression.
* Drop three patches merged upstream
* Submit two patches upstream
* Drop the musl patch since half was already applied upstream and
musl now builds fine without the other piece
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/minicom')
-rw-r--r-- | meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch | 47 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch | 32 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom_2.8.bb (renamed from meta/recipes-extended/minicom/minicom_2.7.1.bb) | 11 |
4 files changed, 31 insertions, 76 deletions
diff --git a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch deleted file mode 100644 index fec67fdd3f..0000000000 --- a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 Aug 2015 22:35:31 +0000 -Subject: [PATCH] Fix build issus surfaced due to musl - -src/getsdir.h:28:14: error: 'MAXNAMLEN' undeclared here (not in a function) - char fname[MAXNAMLEN + 1]; /* filename + terminating null */ - -src/dial.c:352:22: error: 'KIOCSOUND' undeclared (first use in this function) -| ioctl(consolefd, KIOCSOUND, k); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/dial.c | 2 +- - src/getsdir.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/dial.c b/src/dial.c -index a90c1d2..bf02574 100644 ---- a/src/dial.c -+++ b/src/dial.c -@@ -39,7 +39,7 @@ - #include "intl.h" - - #ifdef VC_MUSIC --# if defined(__GLIBC__) -+# if defined(__GLIBC__) || defined(__linux__) - # include <sys/ioctl.h> - # include <sys/kd.h> - # include <sys/time.h> -diff --git a/src/getsdir.c b/src/getsdir.c -index 2195b27..b61a361 100644 ---- a/src/getsdir.c -+++ b/src/getsdir.c -@@ -30,6 +30,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/param.h> - #include <errno.h> - - #include "getsdir.h" --- -2.5.1 - diff --git a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch b/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch index bd8261c979..9e67126f3e 100644 --- a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +++ b/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch @@ -1,35 +1,33 @@ -Subject: [PATCH] fix minicom -h/-v return value is not 0 +Exit normally for help/verison options -Upstream-Status: Pending - -Signed-off-by: Lu Chong <Chong.Lu@windriver.com> +If -v or -h is used for the help/version information, it is a normal exit situation, +not an error condition. Sometimes these are used as a simple operation test of the +resulting binary so the exit code does matter. +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14] --- src/minicom.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/src/minicom.c b/src/minicom.c -index e1a557b..730da7c 100644 ---- a/src/minicom.c -+++ b/src/minicom.c -@@ -1166,15 +1166,13 @@ int main(int argc, char **argv) - "modify it under the terms of the GNU General Public License\n" +Index: minicom-2.8/src/minicom.c +=================================================================== +--- minicom-2.8.orig/src/minicom.c ++++ minicom-2.8/src/minicom.c +@@ -1257,14 +1257,14 @@ int main(int argc, char **argv) + "modify it under the terms of the GNU General Public License\n" "as published by the Free Software Foundation; either version\n" - "2 of the License, or (at your option) any later version.\n\n"); + "2 of the License, or (at your option) any later version.\n\n")); - exit(1); -- break; + exit(0); + break; case 's': /* setup mode */ dosetup = 1; break; case 'h': helpthem(); - exit(1); -- break; + exit(0); + break; case 'p': /* Pseudo terminal to use. */ if (strncmp(optarg, "/dev/", 5) == 0) - optarg += 5; --- -1.7.9.5 - diff --git a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch index f5c08896ff..39dc5c0492 100644 --- a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +++ b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch @@ -1,10 +1,19 @@ -Upstream-Status: Pending +configure: Allow lockdev to be disabled + +When the pkgconfig dependencies may be present, it is useful to be +able to explictly disable the lockdev dependency. This adds such an +option. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14] ---- a/configure.in 2013-02-06 18:18:13.000000000 +0100 -+++ b/configure.in 2013-07-21 15:31:27.614828894 +0200 -@@ -40,7 +40,13 @@ +Index: minicom-2.8/configure.ac +=================================================================== +--- minicom-2.8.orig/configure.ac ++++ minicom-2.8/configure.ac +@@ -43,7 +43,13 @@ if test "x$enable_socket" = xyes; then fi PKG_PROG_PKG_CONFIG diff --git a/meta/recipes-extended/minicom/minicom_2.7.1.bb b/meta/recipes-extended/minicom/minicom_2.8.bb index 4f715cbc71..3abd8a41ca 100644 --- a/meta/recipes-extended/minicom/minicom_2.7.1.bb +++ b/meta/recipes-extended/minicom/minicom_2.8.bb @@ -7,17 +7,12 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" -SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ file://allow.to.disable.lockdev.patch \ file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ - file://0001-Fix-build-issus-surfaced-due-to-musl.patch \ - file://0001-Drop-superfluous-global-variable-definitions.patch \ - file://0002-Drop-superfluous-global-variable-definitions.patch \ - file://0003-Drop-superfluous-global-variable-definitions.patch \ - " +" -SRC_URI[md5sum] = "9021cb8c5445f6e6e74b2acc39962d62" -SRC_URI[sha256sum] = "532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1" +SRC_URI[sha256sum] = "38cea30913a20349326ff3f1763ee1512b7b41601c24f065f365e18e9db0beba" PACKAGECONFIG ??= "" PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" |