summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-14 13:26:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:17 +0000
commitfef0ec64d672663c7fc267f01c6a57e58ec0ac87 (patch)
tree329994b4a3fb01c9ac4214316db06e57ed45b762
parent8668e1798b2dbb546b5c0737f019999ffba3d4b1 (diff)
downloadpoky-fef0ec64d672663c7fc267f01c6a57e58ec0ac87.tar.gz
kbd: update to 2.0.3
0003-Only-inluclude-kernel-headers-with-glibc.patch is handling #include lines that are no longer present in the upstream source so it was dropped. (From OE-Core rev: 3232c56c01631953445429d1eb7ab532404d6271) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.3.bb (renamed from meta/recipes-core/kbd/kbd_2.0.2.bb)5
2 files changed, 2 insertions, 32 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
deleted file mode 100644
index 8bfcb0c7af..0000000000
--- a/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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.3.bb
index 49bb6c9a3f..746b68adee 100644
--- a/meta/recipes-core/kbd/kbd_2.0.2.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.3.bb
@@ -12,11 +12,10 @@ 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 \
16 " 15 "
17 16
18SRC_URI[md5sum] = "87475eb78b1d6e6ab06686dd323ad4ba" 17SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208"
19SRC_URI[sha256sum] = "9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912" 18SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e"
20 19
21PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 20PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
22PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," 21PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"