summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/kbd
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/kbd')
-rw-r--r--meta/recipes-core/kbd/kbd/uclibc-stdarg.patch36
-rw-r--r--meta/recipes-core/kbd/kbd_2.0.1.bb35
2 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch b/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch
new file mode 100644
index 0000000000..be7f324acc
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch
@@ -0,0 +1,36 @@
1In file included from keymap.h:5:0,
2 from ksyms.c:6:
3./keymap/common.h:65:38: error: unknown type name 'va_list'
4 const char *format, va_list args),
5 ^
6./keymap/common.h:66:3: error: expected ';', ',' or ')' before 'const'
7 const void *data);
8 ^
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Index: kbd-2.0.0/src/libkeymap/contextP.h
13===================================================================
14--- kbd-2.0.0.orig/src/libkeymap/contextP.h 2013-08-13 06:46:23.000000000 -0700
15+++ kbd-2.0.0/src/libkeymap/contextP.h 2013-11-05 22:33:49.200528226 -0800
16@@ -2,7 +2,7 @@
17 #define LK_CONTEXTP_H
18
19 #include "keymap.h"
20-
21+#include <stdarg.h>
22 /**
23 * @brief Copy of struct kbdiacruc.
24 */
25Index: kbd-2.0.0/src/libkeymap/keymap/common.h
26===================================================================
27--- kbd-2.0.0.orig/src/libkeymap/keymap/common.h 2013-08-13 06:46:23.000000000 -0700
28+++ kbd-2.0.0/src/libkeymap/keymap/common.h 2013-11-05 22:33:59.964528438 -0800
29@@ -6,6 +6,7 @@
30 */
31
32 #include <keymap/context.h>
33+#include <stdarg.h>
34
35 /** Initializes the structures necessary to read and/or parse keymap.
36 *
diff --git a/meta/recipes-core/kbd/kbd_2.0.1.bb b/meta/recipes-core/kbd/kbd_2.0.1.bb
new file mode 100644
index 0000000000..998a2d39b2
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd_2.0.1.bb
@@ -0,0 +1,35 @@
1SUMMARY = "Keytable files and keyboard utilities"
2# everything minus console-fonts is GPLv2+
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5"
5DEPENDS = "libcheck"
6
7inherit autotools gettext ptest
8
9RREPLACES_${PN} = "console-tools"
10RPROVIDES_${PN} = "console-tools"
11RCONFLICTS_${PN} = "console-tools"
12
13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2 \
14 file://uclibc-stdarg.patch \
15 "
16
17SRC_URI[md5sum] = "f80b93a6abddb6cc2a3652daaf7562ba"
18SRC_URI[sha256sum] = "223d60bb6882323cca161aeb5965590768b2f590fd7cddbf27511ad0ba7a429e"
19
20PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
21PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
22
23PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
24
25FILES_${PN}-consolefonts = "${datadir}/consolefonts"
26FILES_${PN}-consoletrans = "${datadir}/consoletrans"
27FILES_${PN}-keymaps = "${datadir}/keymaps"
28FILES_${PN}-unimaps = "${datadir}/unimaps"
29
30inherit update-alternatives
31
32ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt"
33ALTERNATIVE_PRIORITY = "100"
34
35BBCLASSEXTEND = "native"