diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 5 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch | 33 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch | 30 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom_2.9.bb (renamed from meta/recipes-extended/minicom/minicom_2.8.bb) | 7 |
4 files changed, 5 insertions, 70 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index ecff3a9ebd..a1cccc39eb 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -1165,9 +1165,10 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1165 | result = runCmd('git commit -m "Add a new file"', cwd=tempdir) | 1165 | result = runCmd('git commit -m "Add a new file"', cwd=tempdir) |
1166 | self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) | 1166 | self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) |
1167 | result = runCmd('devtool update-recipe %s' % testrecipe) | 1167 | result = runCmd('devtool update-recipe %s' % testrecipe) |
1168 | result = runCmd('git add minicom', cwd=os.path.dirname(recipefile)) | ||
1168 | expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), | 1169 | expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), |
1169 | ('??', '.*/0001-Change-the-README.patch$'), | 1170 | ('A ', '.*/0001-Change-the-README.patch$'), |
1170 | ('??', '.*/0002-Add-a-new-file.patch$')] | 1171 | ('A ', '.*/0002-Add-a-new-file.patch$')] |
1171 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 1172 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
1172 | 1173 | ||
1173 | def test_devtool_update_recipe_git(self): | 1174 | def test_devtool_update_recipe_git(self): |
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 9e67126f3e..0000000000 --- a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Exit normally for help/verison options | ||
2 | |||
3 | If -v or -h is used for the help/version information, it is a normal exit situation, | ||
4 | not an error condition. Sometimes these are used as a simple operation test of the | ||
5 | resulting binary so the exit code does matter. | ||
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] | ||
9 | --- | ||
10 | src/minicom.c | 6 ++---- | ||
11 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
12 | |||
13 | Index: minicom-2.8/src/minicom.c | ||
14 | =================================================================== | ||
15 | --- minicom-2.8.orig/src/minicom.c | ||
16 | +++ minicom-2.8/src/minicom.c | ||
17 | @@ -1257,14 +1257,14 @@ int main(int argc, char **argv) | ||
18 | "modify it under the terms of the GNU General Public License\n" | ||
19 | "as published by the Free Software Foundation; either version\n" | ||
20 | "2 of the License, or (at your option) any later version.\n\n")); | ||
21 | - exit(1); | ||
22 | + exit(0); | ||
23 | break; | ||
24 | case 's': /* setup mode */ | ||
25 | dosetup = 1; | ||
26 | break; | ||
27 | case 'h': | ||
28 | helpthem(); | ||
29 | - exit(1); | ||
30 | + exit(0); | ||
31 | break; | ||
32 | case 'p': /* Pseudo terminal to use. */ | ||
33 | if (strncmp(optarg, "/dev/", 5) == 0) | ||
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 39dc5c0492..0000000000 --- a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
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. | ||
6 | |||
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] | ||
11 | |||
12 | Index: minicom-2.8/configure.ac | ||
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 | ||
17 | fi | ||
18 | |||
19 | PKG_PROG_PKG_CONFIG | ||
20 | -if test -n "$PKG_CONFIG"; then | ||
21 | + | ||
22 | +AC_ARG_ENABLE([lockdev], | ||
23 | + AS_HELP_STRING([--enable-lockdev], | ||
24 | + [Enable lockdev support (def: enabled)]), | ||
25 | + [], [enable_lockdev="yes"]) | ||
26 | + | ||
27 | +if test -n "$PKG_CONFIG" && test "x$enable_lockdev" = xyes; then | ||
28 | PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define if you have lockdev]),[:]) | ||
29 | fi | ||
30 | |||
diff --git a/meta/recipes-extended/minicom/minicom_2.8.bb b/meta/recipes-extended/minicom/minicom_2.9.bb index 2640c6b057..907d5c79c9 100644 --- a/meta/recipes-extended/minicom/minicom_2.8.bb +++ b/meta/recipes-extended/minicom/minicom_2.9.bb | |||
@@ -7,12 +7,9 @@ LICENSE = "GPL-2.0-or-later" | |||
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.bz2 \ | 10 | SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2" |
11 | file://allow.to.disable.lockdev.patch \ | ||
12 | file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ | ||
13 | " | ||
14 | 11 | ||
15 | SRC_URI[sha256sum] = "38cea30913a20349326ff3f1763ee1512b7b41601c24f065f365e18e9db0beba" | 12 | SRC_URI[sha256sum] = "9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c" |
16 | 13 | ||
17 | PACKAGECONFIG ??= "" | 14 | PACKAGECONFIG ??= "" |
18 | PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" | 15 | PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" |