From 4e5a734d4d491d641efd055a4a5c4cb37e2de420 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Tue, 21 Jan 2014 10:55:20 +0200 Subject: minicom: upgrade to 2.7 Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- ...001-fix-minicom-h-v-return-value-is-not-0.patch | 35 ---------------------- .../minicom-2.6.2/allow.to.disable.lockdev.patch | 21 ------------- ...001-fix-minicom-h-v-return-value-is-not-0.patch | 35 ++++++++++++++++++++++ .../minicom/minicom/allow.to.disable.lockdev.patch | 21 +++++++++++++ meta/recipes-extended/minicom/minicom_2.6.2.bb | 26 ---------------- meta/recipes-extended/minicom/minicom_2.7.bb | 26 ++++++++++++++++ 6 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch delete mode 100644 meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch create mode 100644 meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch create mode 100644 meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch delete mode 100644 meta/recipes-extended/minicom/minicom_2.6.2.bb create mode 100644 meta/recipes-extended/minicom/minicom_2.7.bb (limited to 'meta/recipes-extended/minicom') diff --git a/meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch b/meta/recipes-extended/minicom/minicom-2.6.2/0001-fix-minicom-h-v-return-value-is-not-0.patch deleted file mode 100644 index bd8261c979..0000000000 --- a/meta/recipes-extended/minicom/minicom-2.6.2/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 - ---- - 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-2.6.2/allow.to.disable.lockdev.patch b/meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch deleted file mode 100644 index f5c08896ff..0000000000 --- a/meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Martin Jansa - ---- 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/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 new file mode 100644 index 0000000000..bd8261c979 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch @@ -0,0 +1,35 @@ +Subject: [PATCH] fix minicom -h/-v return value is not 0 + +Upstream-Status: Pending + +Signed-off-by: Lu Chong + +--- + 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 new file mode 100644 index 0000000000..f5c08896ff --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch @@ -0,0 +1,21 @@ +Upstream-Status: Pending + +Signed-off-by: Martin Jansa + +--- 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.6.2.bb b/meta/recipes-extended/minicom/minicom_2.6.2.bb deleted file mode 100644 index 071682d3d4..0000000000 --- a/meta/recipes-extended/minicom/minicom_2.6.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Text-based modem control and terminal emulation program" -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+" -LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ - file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" - - -SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz \ - file://allow.to.disable.lockdev.patch \ - file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ -" - -SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c" -SRC_URI[sha256sum] = "f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" - -inherit autotools gettext - -do_install() { - for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done -} - diff --git a/meta/recipes-extended/minicom/minicom_2.7.bb b/meta/recipes-extended/minicom/minicom_2.7.bb new file mode 100644 index 0000000000..9f8ebe4741 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom_2.7.bb @@ -0,0 +1,26 @@ +SUMMARY = "Text-based modem control and terminal emulation program" +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+" +LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ + file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" + + +SRC_URI = "http://alioth.debian.org/frs/download.php/file/3977/${PN}-${PV}.tar.gz \ + file://allow.to.disable.lockdev.patch \ + file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ +" + +SRC_URI[md5sum] = "7044ca3e291268c33294f171d426dc2d" +SRC_URI[sha256sum] = "9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" + +inherit autotools gettext + +do_install() { + for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done +} + -- cgit 1.2.3-korg