summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-10 18:20:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:33:23 +0100
commit683942be6fb732fb929cac49e2d59fc9fd4ad02b (patch)
treee1448bbd813d6e6f619203d9acc3aa0f2a8af3d2 /meta
parent4fb58a4585f6582c0c4016acfd47fc1e28e54b0b (diff)
downloadpoky-683942be6fb732fb929cac49e2d59fc9fd4ad02b.tar.gz
kbd: Mark glibc headers under __GLIBC__
Change-Id: I4e91038ea8b05defbb9d574c61eea96ccc064e51 (From OE-Core rev: f4ad72e6e46e481d3fad920be9bb417fd175a991) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch29
-rw-r--r--meta/recipes-core/kbd/kbd_2.0.2.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch b/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch
new file mode 100644
index 0000000000..8bfcb0c7af
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch
@@ -0,0 +1,29 @@
1From 3c5c7acc7ef874b919b26583d3892e21b907833f Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 20 Aug 2014 09:00:03 +0200
4Subject: [PATCH 3/4] Only inluclude kernel headers with glibc
5
6This fixes compile errors with musl libc
7
8Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
9Upstream-Status: Pending
10---
11 src/resizecons.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/resizecons.c b/src/resizecons.c
15index 5f84845..691dfcc 100644
16--- a/src/resizecons.c
17+++ b/src/resizecons.c
18@@ -80,7 +80,7 @@
19 #include <sys/ioctl.h>
20 #if (__GNU_LIBRARY__ >= 6)
21 #include <sys/perm.h>
22-#else
23+#elif defined(__GLIBC__)
24 #include <linux/types.h>
25 #include <linux/termios.h>
26 #endif
27--
282.1.0
29
diff --git a/meta/recipes-core/kbd/kbd_2.0.2.bb b/meta/recipes-core/kbd/kbd_2.0.2.bb
index 0aa976a46b..136dc7ac0e 100644
--- a/meta/recipes-core/kbd/kbd_2.0.2.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.2.bb
@@ -12,6 +12,7 @@ RCONFLICTS_${PN} = "console-tools"
12 12
13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ 13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
14 file://uclibc-stdarg.patch \ 14 file://uclibc-stdarg.patch \
15 file://0003-Only-inluclude-kernel-headers-with-glibc.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "87475eb78b1d6e6ab06686dd323ad4ba" 18SRC_URI[md5sum] = "87475eb78b1d6e6ab06686dd323ad4ba"