From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...0001-Fix-build-issus-surfaced-due-to-musl.patch | 47 ++++++++++++++++++++++ ...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.7.1.bb | 30 ++++++++++++++ 4 files changed, 133 insertions(+) create mode 100644 poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch create mode 100644 poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch create mode 100644 poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch create mode 100644 poky/meta/recipes-extended/minicom/minicom_2.7.1.bb (limited to 'poky/meta/recipes-extended/minicom') diff --git a/poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch new file mode 100644 index 000000000..fec67fdd3 --- /dev/null +++ b/poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch @@ -0,0 +1,47 @@ +From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- +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 + # include + # include +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 + #include + #include ++#include + #include + + #include "getsdir.h" +-- +2.5.1 + diff --git a/poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch b/poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch new file mode 100644 index 000000000..bd8261c97 --- /dev/null +++ b/poky/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/poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch b/poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch new file mode 100644 index 000000000..f5c08896f --- /dev/null +++ b/poky/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/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb new file mode 100644 index 000000000..e6afe2b65 --- /dev/null +++ b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "Text-based modem control and terminal emulation program" +HOMEPAGE = "http://alioth.debian.org/projects/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+" +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[md5sum] = "9021cb8c5445f6e6e74b2acc39962d62" +SRC_URI[sha256sum] = "532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1" + +UPSTREAM_CHECK_URI = "https://alioth.debian.org/frs/?group_id=30018" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" + +inherit autotools gettext pkgconfig + +do_install() { + for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done +} + +RRECOMMENDS_${PN} += "lrzsz" -- cgit v1.2.1