diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2014-01-21 10:55:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:52:33 +0000 |
commit | 2eacc8715e7365061dc8a3bdad11cabe56dc2ba7 (patch) | |
tree | a5660f9e517ddf1f9c85d9c0baa970c21f45ee09 /meta/recipes-extended/minicom/minicom | |
parent | 624c648a9a2c394535f6f528cc64d20b4bfc24bc (diff) | |
download | poky-2eacc8715e7365061dc8a3bdad11cabe56dc2ba7.tar.gz |
minicom: upgrade to 2.7
(From OE-Core rev: 4e5a734d4d491d641efd055a4a5c4cb37e2de420)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/minicom/minicom')
-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 |
2 files changed, 56 insertions, 0 deletions
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 @@ | |||
1 | Subject: [PATCH] fix minicom -h/-v return value is not 0 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Lu Chong <Chong.Lu@windriver.com> | ||
6 | |||
7 | --- | ||
8 | src/minicom.c | 6 ++---- | ||
9 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git a/src/minicom.c b/src/minicom.c | ||
12 | index e1a557b..730da7c 100644 | ||
13 | --- a/src/minicom.c | ||
14 | +++ b/src/minicom.c | ||
15 | @@ -1166,15 +1166,13 @@ int main(int argc, char **argv) | ||
16 | "modify it under the terms of the GNU General Public License\n" | ||
17 | "as published by the Free Software Foundation; either version\n" | ||
18 | "2 of the License, or (at your option) any later version.\n\n"); | ||
19 | - exit(1); | ||
20 | - break; | ||
21 | + exit(0); | ||
22 | case 's': /* setup mode */ | ||
23 | dosetup = 1; | ||
24 | break; | ||
25 | case 'h': | ||
26 | helpthem(); | ||
27 | - exit(1); | ||
28 | - break; | ||
29 | + exit(0); | ||
30 | case 'p': /* Pseudo terminal to use. */ | ||
31 | 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 new file mode 100644 index 0000000000..f5c08896ff --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
4 | |||
5 | --- a/configure.in 2013-02-06 18:18:13.000000000 +0100 | ||
6 | +++ b/configure.in 2013-07-21 15:31:27.614828894 +0200 | ||
7 | @@ -40,7 +40,13 @@ | ||
8 | fi | ||
9 | |||
10 | PKG_PROG_PKG_CONFIG | ||
11 | -if test -n "$PKG_CONFIG"; then | ||
12 | + | ||
13 | +AC_ARG_ENABLE([lockdev], | ||
14 | + AS_HELP_STRING([--enable-lockdev], | ||
15 | + [Enable lockdev support (def: enabled)]), | ||
16 | + [], [enable_lockdev="yes"]) | ||
17 | + | ||
18 | +if test -n "$PKG_CONFIG" && test "x$enable_lockdev" = xyes; then | ||
19 | PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define if you have lockdev]),[:]) | ||
20 | fi | ||
21 | |||