diff options
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 | 35 | ||||
| -rw-r--r-- | meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-extended/minicom/minicom_2.9.bb (renamed from meta/recipes-extended/minicom/minicom_2.7.1.bb) | 18 |
4 files changed, 7 insertions, 114 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 deleted file mode 100644 index bd8261c979..0000000000 --- a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +++ /dev/null @@ -1,35 +0,0 @@ -Subject: [PATCH] fix minicom -h/-v return value is not 0 - -Upstream-Status: Pending - -Signed-off-by: Lu Chong <Chong.Lu@windriver.com> - ---- - 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" - "as published by the Free Software Foundation; either version\n" - "2 of the License, or (at your option) any later version.\n\n"); -- exit(1); -- break; -+ exit(0); - case 's': /* setup mode */ - dosetup = 1; - break; - case 'h': - helpthem(); -- exit(1); -- break; -+ exit(0); - 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 deleted file mode 100644 index f5c08896ff..0000000000 --- a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- 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 @@ - fi - - PKG_PROG_PKG_CONFIG --if test -n "$PKG_CONFIG"; then -+ -+AC_ARG_ENABLE([lockdev], -+ AS_HELP_STRING([--enable-lockdev], -+ [Enable lockdev support (def: enabled)]), -+ [], [enable_lockdev="yes"]) -+ -+if test -n "$PKG_CONFIG" && test "x$enable_lockdev" = xyes; then - PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define if you have lockdev]),[:]) - fi - diff --git a/meta/recipes-extended/minicom/minicom_2.7.1.bb b/meta/recipes-extended/minicom/minicom_2.9.bb index 1a31a872d6..907d5c79c9 100644 --- a/meta/recipes-extended/minicom/minicom_2.7.1.bb +++ b/meta/recipes-extended/minicom/minicom_2.9.bb @@ -1,22 +1,15 @@ SUMMARY = "Text-based modem control and terminal emulation program" -HOMEPAGE = "http://alioth.debian.org/projects/minicom/" +HOMEPAGE = "https://salsa.debian.org/minicom-team/minicom" DESCRIPTION = "Minicom is a text-based modem control and terminal emulation program for Unix-like operating systems" SECTION = "console/network" DEPENDS = "ncurses virtual/libiconv" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" -SRC_URI = "https://alioth.debian.org/frs/download.php/latestfile/3/${BP}.tar.gz \ - 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 \ - " +SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2" -SRC_URI[md5sum] = "9021cb8c5445f6e6e74b2acc39962d62" -SRC_URI[sha256sum] = "532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1" - -UPSTREAM_CHECK_URI = "https://alioth.debian.org/frs/?group_id=30018" +SRC_URI[sha256sum] = "9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c" PACKAGECONFIG ??= "" PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" @@ -27,3 +20,6 @@ do_install() { for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done } +RRECOMMENDS:${PN} += "lrzsz" + +RDEPENDS:${PN} += "ncurses-terminfo-base" |