mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

minicom: upgrade 2.8 -> 2.9

Browse Source 
Adjust selftest to git-add the directory with newly added patches,
as the new minicom recipe has no default patches, and thus no directory
with them (and the selftest assumed it does).

(From OE-Core rev: 1fb2aa3f242ef20f8edfb518164b629258a04dd4)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-03-06 07:42:18 -08:00
committed by Richard Purdie
parent 9c02943208
commit d339047b83
4 changed files with 5 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/lib/oeqa/selftest/cases/devtool.py
View File

@@ -1165,9 +1165,10 @@ class DevtoolUpdateTests(DevtoolBase):
result = runCmd('git commit -m "Add a new file"', cwd=tempdir)
self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)))
result = runCmd('devtool update-recipe %s' % testrecipe)
result = runCmd('git add minicom', cwd=os.path.dirname(recipefile))
expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)),
('??', '.*/0001-Change-the-README.patch$'),
('??', '.*/0002-Add-a-new-file.patch$')]
('A ', '.*/0001-Change-the-README.patch$'),
('A ', '.*/0002-Add-a-new-file.patch$')]
self._check_repo_status(os.path.dirname(recipefile), expected_status)
def test_devtool_update_recipe_git(self):

33
meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
View File

@@ -1,33 +0,0 @@
Exit normally for help/verison options
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 <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14]
---
src/minicom.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
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"));
- exit(1);
+ exit(0);
break;
case 's': /* setup mode */
dosetup = 1;
break;
case 'h':
helpthem();
- exit(1);
+ exit(0);
break;
case 'p': /* Pseudo terminal to use. */
if (strncmp(optarg, "/dev/", 5) == 0)

30
meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
View File

@@ -1,30 +0,0 @@
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 <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14]
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
-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

7
meta/recipes-extended/minicom/minicom_2.8.bb → meta/recipes-extended/minicom/minicom_2.9.bb
View File

@@ -7,12 +7,9 @@ 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 = "${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 \
"
SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2"
SRC_URI[sha256sum] = "38cea30913a20349326ff3f1763ee1512b7b41601c24f065f365e18e9db0beba"
SRC_URI[sha256sum] = "9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c"
PACKAGECONFIG ??= ""
PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev"