diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-14 13:26:29 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-16 12:11:25 +0000 |
| commit | 3232c56c01631953445429d1eb7ab532404d6271 (patch) | |
| tree | 6400e9b25673ea4fbe6fbc947eb7bfdef3aa164a | |
| parent | 8b21d3b32f8ac4cc4b3ebea1db2b13df0dec1c3b (diff) | |
| download | openembedded-core-3232c56c01631953445429d1eb7ab532404d6271.tar.gz openembedded-core-3232c56c01631953445429d1eb7ab532404d6271.tar.bz2 openembedded-core-3232c56c01631953445429d1eb7ab532404d6271.zip | |
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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch | 29 | ||||
| -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 @@ -From 3c5c7acc7ef874b919b26583d3892e21b907833f Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 20 Aug 2014 09:00:03 +0200 -Subject: [PATCH 3/4] Only inluclude kernel headers with glibc - -This fixes compile errors with musl libc - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> -Upstream-Status: Pending ---- - src/resizecons.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/resizecons.c b/src/resizecons.c -index 5f84845..691dfcc 100644 ---- a/src/resizecons.c -+++ b/src/resizecons.c -@@ -80,7 +80,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.1.0 - 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" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ file://uclibc-stdarg.patch \ - file://0003-Only-inluclude-kernel-headers-with-glibc.patch \ " -SRC_URI[md5sum] = "87475eb78b1d6e6ab06686dd323ad4ba" -SRC_URI[sha256sum] = "9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912" +SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208" +SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," |