minicom: Upgrade 2.7.1 -> 2.8
PATCH 1/1 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
---
...Fix-build-issus-surfaced-due-to-musl.patch | 47 -------------------
...ix-minicom-h-v-return-value-is-not-0.patch | 32 ++++++-------
.../minicom/allow.to.disable.lockdev.patch | 17 +++++--
.../{minicom_2.7.1.bb => minicom_2.8.bb} | 11 ++---
4 files changed, 31 insertions(+), 76 deletions(-)
delete mode 100644 meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
rename meta/recipes-extended/minicom/{minicom_2.7.1.bb => minicom_2.8.bb} (68%)meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch deleted +0 -47
@@ -1,47 +0,0 @@ -From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- -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 -
meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +15 -17
@@ -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 <[email protected]> +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 <[email protected]> +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 -
meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +13 -4
@@ -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 <[email protected]> +Signed-off-by: Richard Purdie <[email protected]> + +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
meta/recipes-extended/minicom/minicom_2.8.bb renamed from meta/recipes-extended/minicom/minicom_2.7.1.bb +3 -8
@@ -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"
Signature · 1 line
2.32.0
Since AUH didn't pick this up, can you run 'devtool latest-version minicom' with this update, as it probably would report something that needs fixing via regexp?
Alex
Quoted 223 lines · Richard Purdie
* 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 pieceSigned-off-by Richard Purdie <[email protected]>--- ...Fix-build-issus-surfaced-due-to-musl.patch | 47 ------------------- ...ix-minicom-h-v-return-value-is-not-0.patch | 32 ++++++------- .../minicom/allow.to.disable.lockdev.patch | 17 +++++-- .../{minicom_2.7.1.bb => minicom_2.8.bb} | 11 ++--- 4 files changed, 31 insertions(+), 76 deletions(-) delete mode 100644 meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch rename meta/recipes-extended/minicom/{minicom_2.7.1.bb => minicom_2.8.bb}(68%)
diff --git
a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patchb/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patchdeleted file mode 100644
index fec67fdd3fd..00000000000
---a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch+++/dev/nullmeta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch deleted +0
-6@@ -1,47 +0,0 @@ -From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 afunction)
meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch deleted +0
-3- char fname[MAXNAMLEN + 1]; /* filename + terminating null */ - -src/dial.c:352:22: error: 'KIOCSOUND' undeclared (first use in thisfunction)
-|ioctl(consolefd, KIOCSOUND, k);meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch deleted +0
-37- -Signed-off-by: Khem Raj <[email protected]> ---- -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.patchb/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patchindexbd8261c979d..9e67126f3e1100644
---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.patchmeta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +3
-4@@ -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 <[email protected]> +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 operationtest of the
meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +3
-0+resulting binary so the exit code does matter. +Signed-off-by: Richard Purdie <[email protected]> +Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14]
---src/minicom.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +0
-6-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 PublicLicense\n"
meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +6
-0+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 PublicLicense\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);meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +2
-5+ 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 -meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +8
-1@@ -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 <[email protected]> +Signed-off-by: Richard Purdie <[email protected]> + +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 @@meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +5
-0+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_CONFIGmeta/recipes-extended/minicom/minicom_2.8.bb renamed from meta/recipes-extended/minicom/minicom_2.7.1.bb +2
-8@@ -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"
--
2.32.0-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#159227):
https://lists.openembedded.org/g/openembedded-core/message/159227
Mute This Topic: https://lists.openembedded.org/mt/87539156/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 3 lines · Alexander Kanavin
Since AUH didn't pick this up, can you run 'devtool latest-version minicom' with this update, as it probably would report something that needs fixing via regexp?
That shows:
WARNING: latest_versionstring: package minicom_2.8.orig.tar.bz2 don't match pattern
Cheers,
Richard
This one is odd and it should be working. I'll cherry-pick your update and get to the bottom of it. This may mean we are missing other updates that are coming from debian tarballs.
Alex
Quoted 17 lines · Richard Purdie
Quoted 1 line · Alexander Kanavin
Since AUH didn't pick this up, can you run 'devtool latest-version
minicom'
Quoted 1 line
with this update, as it probably would report something that needs
fixing via
Quoted 1 line
regexp?
That shows:
WARNING:
latest_versionstring: package minicom_2.8.orig.tar.bz2 don't match patternCheers,
Richard
I think the answer is that latest release is a bz2, while the older one are gzipped
http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.7.1.orig.tar.gz
vs.
http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.8.orig.tar.bz2
Quoted 32 lines · Alexander Kanavin
This one is odd and it should be working. I'll cherry-pick your update and get to the bottom of it. This may mean we are missing other updates that are coming from debian tarballs.
Alex
On Mon, 6 Dec 2021 at 14:59, Richard Purdie <[email protected] <mailto:[email protected]>> wrote:
On Mon, 2021-12-06 at 14:43 +0100, Alexander Kanavin wrote:
> Since AUH didn't pick this up, can you run 'devtool
latest-version minicom'
> with this update, as it probably would report something that
needs fixing via
> regexp?That shows:
WARNING:
latest_versionstring: package minicom_2.8.orig.tar.bz2 don't match patternCheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159251): https://lists.openembedded.org/g/openembedded-core/message/159251
Mute This Topic: https://lists.openembedded.org/mt/87539156/3647476
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
It's of course *not* the file extension, but the .orig. that is confusing the default upstream regex check
This here worked for me
UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)\.orig\..*"
but surely it can be fine tuned
Quoted 45 lines · Konrad Weihmann
I think the answer is that latest release is a bz2, while the older one are gzipped
http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.7.1.orig.tar.gz
vs.
http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.8.orig.tar.bz2
Quoted 13 lines · Alexander Kanavin
This one is odd and it should be working. I'll cherry-pick your update and get to the bottom of it. This may mean we are missing other updates that are coming from debian tarballs.
Alex
On Mon, 6 Dec 2021 at 14:59, Richard Purdie <[email protected] <mailto:[email protected]>> wrote:
On Mon, 2021-12-06 at 14:43 +0100, Alexander Kanavin wrote:
> Since AUH didn't pick this up, can you run 'devtool latest-version minicom'
> with this update, as it probably would report something that needs fixing via
> regexp?Quoted 13 lines
That shows:
WARNING:
latest_versionstring: package minicom_2.8.orig.tar.bz2 don't match patternCheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159255): https://lists.openembedded.org/g/openembedded-core/message/159255
Mute This Topic: https://lists.openembedded.org/mt/87539156/3647476
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
I just sent the proper fix to bitbake-devel :)
Alex
Quoted 65 lines · Konrad Weihmann
It's of course *not* the file extension, but the .orig. that is confusing the default upstream regex check
This here worked for me
UPSTREAM_CHECK_REGEX= "${BPN}_(?P<pver>\d+(\.\d+)+)\.orig\..*"but surely it can be fine tuned
Quoted 4 lines · Konrad Weihmann
I think the answer is that latest release is a bz2, while the older one are gzipped
http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.7.1.orig.tar.gz
Quoted 4 lines
vs.
http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.8.orig.tar.bz2
Quoted 34 lines · Alexander Kanavin
Quoted 17 lines
This one is odd and it should be working. I'll cherry-pick your update and get to the bottom of it. This may mean we are missing other updates that are coming from debian tarballs.
Alex
On Mon, 6 Dec 2021 at 14:59, Richard Purdie <[email protected] <mailto:[email protected]>> wrote:
On Mon, 2021-12-06 at 14:43 +0100, Alexander Kanavin wrote:
> Since AUH didn't pick this up, can you run 'devtool
latest-version minicom'
> with this update, as it probably would report something that
needs fixing via
> regexp?Quoted 13 lines
That shows:
WARNING:
latest_versionstring: package minicom_2.8.orig.tar.bz2 don't match patternCheers,
Richard
Quoted 3 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#159255):https://lists.openembedded.org/g/openembedded-core/message/159255
Quoted 3 lines
Mute This Topic: https://lists.openembedded.org/mt/87539156/3647476
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Quoted 2 lines
-=-=-=-=-=-=-=-=-=-=-=-