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