diff options
Diffstat (limited to 'yocto-poky/meta/recipes-core/console-tools')
3 files changed, 103 insertions, 1 deletions
diff --git a/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch new file mode 100644 index 000000000..ace4bf0a7 --- /dev/null +++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch @@ -0,0 +1,51 @@ +From b6a59b05f1fa514c6b387c9544bd63b1bfcf2eed Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jan 2016 05:38:29 +0000 +Subject: [PATCH] Cover the else with __GLIBC__ + +Fixes build errors on musl/x86 + +| In file included from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm/termios.h:1:0, +| from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/linux/termios.h:5, +| from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:86: +| +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm-generic/termios.h:14:8: +error: redefinition of 'struct winsize' +| struct winsize { +| ^ +| In file included from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/sys/ioctl.h:7:0, +| from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:81: +| +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/bits/ioctl.h:90:8: +note: originally defined here +| struct winsize { +| ^ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + vttools/resizecons.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vttools/resizecons.c b/vttools/resizecons.c +index f0a7055..e8753b1 100644 +--- a/vttools/resizecons.c ++++ b/vttools/resizecons.c +@@ -81,7 +81,7 @@ + #include <sys/ioctl.h> + #if (__GNU_LIBRARY__ >= 6) + # include <sys/perm.h> +-#else ++#elif defined __GLIBC__ + # include <linux/types.h> + # include <linux/termios.h> + #endif +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch new file mode 100644 index 000000000..64b5b044d --- /dev/null +++ b/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch @@ -0,0 +1,44 @@ +From 0fd5dda51d68e1ec2a87e27b5ed0dff3503b4681 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 31 Dec 2015 08:12:38 +0000 +Subject: [PATCH] kbdtools: Include sys/types.h for u_char and u_short + definition + +on musl this gets exposed since sys/types.h is not +included via some other indirect inclusion as is the case with glibc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + kbdtools/dumpkeys.c | 1 + + kbdtools/loadkeys.y | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/kbdtools/dumpkeys.c b/kbdtools/dumpkeys.c +index 6159d49..c19fb21 100644 +--- a/kbdtools/dumpkeys.c ++++ b/kbdtools/dumpkeys.c +@@ -26,6 +26,7 @@ + #include <errno.h> + #include <sysexits.h> + #include <sys/ioctl.h> ++#include <sys/types.h> + #include <linux/types.h> + #include <linux/kd.h> + #include <linux/keyboard.h> +diff --git a/kbdtools/loadkeys.y b/kbdtools/loadkeys.y +index b6a8e01..4468f77 100644 +--- a/kbdtools/loadkeys.y ++++ b/kbdtools/loadkeys.y +@@ -71,6 +71,7 @@ + #include <linux/kd.h> + #include <linux/keyboard.h> + #include <sys/ioctl.h> ++#include <sys/types.h> + #include <ctype.h> + #include <sysexits.h> + #include <signal.h> +-- +2.6.4 + diff --git a/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb index c60a5a05b..1db8414cb 100644 --- a/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb +++ b/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb @@ -14,12 +14,19 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://nodocs.patch \ file://fix-libconsole-linking.patch \ file://no-dep-on-libfl.patch \ + file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \ + file://0001-Cover-the-else-with-__GLIBC__.patch \ file://lcmessage.m4 \ file://Makevars" SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd" SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/" +UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/" + +CFLAGS_append_aarch64 = " -D_USE_TERMIOS " + do_configure_prepend () { mkdir -p ${S}/m4 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/ @@ -29,7 +36,7 @@ do_configure_prepend () { inherit autotools gettext update-alternatives -ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_PRIORITY = "30" bindir_progs = "chvt deallocvt fgconsole openvt" ALTERNATIVE_${PN} = "${bindir_progs}" |