summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-02 21:51:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:28 +0000
commitda8163504d70de66381db50e5078794a1b61dad4 (patch)
tree48d8369d42185d64de94809be2ce39fd24dce3fd
parent205a07af84554f95edf527cdc85707e596604c8d (diff)
downloadpoky-da8163504d70de66381db50e5078794a1b61dad4.tar.gz
console-tools: Include sys/types.h for u_char and u_short defs
(From OE-Core rev: 916ca791c70ec2bddae7623e77b7e39b6c591907) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch44
-rw-r--r--meta/recipes-core/console-tools/console-tools_0.3.2.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch b/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 0000000000..64b5b044dd
--- /dev/null
+++ b/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 @@
1From 0fd5dda51d68e1ec2a87e27b5ed0dff3503b4681 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 08:12:38 +0000
4Subject: [PATCH] kbdtools: Include sys/types.h for u_char and u_short
5 definition
6
7on musl this gets exposed since sys/types.h is not
8included via some other indirect inclusion as is the case with glibc
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 kbdtools/dumpkeys.c | 1 +
15 kbdtools/loadkeys.y | 1 +
16 2 files changed, 2 insertions(+)
17
18diff --git a/kbdtools/dumpkeys.c b/kbdtools/dumpkeys.c
19index 6159d49..c19fb21 100644
20--- a/kbdtools/dumpkeys.c
21+++ b/kbdtools/dumpkeys.c
22@@ -26,6 +26,7 @@
23 #include <errno.h>
24 #include <sysexits.h>
25 #include <sys/ioctl.h>
26+#include <sys/types.h>
27 #include <linux/types.h>
28 #include <linux/kd.h>
29 #include <linux/keyboard.h>
30diff --git a/kbdtools/loadkeys.y b/kbdtools/loadkeys.y
31index b6a8e01..4468f77 100644
32--- a/kbdtools/loadkeys.y
33+++ b/kbdtools/loadkeys.y
34@@ -71,6 +71,7 @@
35 #include <linux/kd.h>
36 #include <linux/keyboard.h>
37 #include <sys/ioctl.h>
38+#include <sys/types.h>
39 #include <ctype.h>
40 #include <sysexits.h>
41 #include <signal.h>
42--
432.6.4
44
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 7e14b31a00..d14d683d1b 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -14,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
14 file://nodocs.patch \ 14 file://nodocs.patch \
15 file://fix-libconsole-linking.patch \ 15 file://fix-libconsole-linking.patch \
16 file://no-dep-on-libfl.patch \ 16 file://no-dep-on-libfl.patch \
17 file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \
17 file://lcmessage.m4 \ 18 file://lcmessage.m4 \
18 file://Makevars" 19 file://Makevars"
19 20