kbd: rework and version bump 1.15.2 -> 2.0.1

This patch updated the kbd package to version 2.0.1 and add many new
tools option which are available to install.

Also add options to install consolefonts, consoletrans, keymaps, etc...

Add new patch for remove the building for tests which also check for
"check" which is not necessary.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
[mol: regenerate patches with git-ptx-patches]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 51 insertions, 10 deletions

diff --git a/patches/kbd-1.15.2/series b/patches/kbd-1.15.2/series
deleted file mode 100644
index d6cc8bde2..000000000
--- a/patches/kbd-1.15.2/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-getkeycode-show-reserved-scancode.patch
diff --git a/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
new file mode 100644
index 000000000..f1d7a444a
--- /dev/null
+++ b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
@@ -0,0 +1,39 @@
+From: Alexander Aring <alex.aring@gmail.com>
+Date: Sun, 15 Jun 2014 15:48:20 +0200
+Subject: [PATCH] Makefile: configure: don't depend on check for tests
+
+This patch removes the dependency for check and removes the build of the tests
+environment.
+
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 89c7e835d601..beb6e29a3ac9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,7 +8,7 @@ EXTRA_DIST = \
+ 	CREDITS \
+ 	contrib docs rc
+ 
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
+ 
+ kbd-$(VERSION).tar.xz:
+ 	make distcheck
+diff --git a/configure.ac b/configure.ac
+index 960cc07f3ed6..b9879adeade4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,8 +11,6 @@ AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz])
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+-
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+ 
diff --git a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
index de0c9f871..91fe8e82b 100644
--- a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
+++ b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
@@ -1,4 +1,3 @@
-From 3b6394ed6c8f26a4c59ce1446b40af9db6100f44 Mon Sep 17 00:00:00 2001
 From: Luotao Fu <l.fu@pengutronix.de>
 Date: Fri, 4 Jun 2010 10:36:42 +0200
 Subject: [PATCH] getkeycode: show reserved scancode
@@ -11,16 +10,17 @@ change the scan range to start from 0.
 probably not for mainline, as far kdb is maintained et all.
 
 Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
 ---
- src/getkeycodes.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/getkeycodes.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/getkeycodes.c b/src/getkeycodes.c
-index 6504e7e..2ea5298 100644
+index d1fccf90612f..500fc5f1089b 100644
 --- a/src/getkeycodes.c
 +++ b/src/getkeycodes.c
-@@ -47,7 +47,7 @@ main(int argc, char **argv) {
- 		old_kernel = 1;
+@@ -44,7 +44,7 @@ main(int argc, char **argv) {
+ 	if (ioctl(fd, KDGETKEYCODE, &a)) {
  		sc0 = 89;
  	} else
 -	for (sc0 = 1; sc0 <= 88; sc0++) {
@@ -28,6 +28,3 @@ index 6504e7e..2ea5298 100644
  		a.scancode = sc0;
  		a.keycode = 0;
  		if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
--- 
-1.7.1
-
diff --git a/patches/kbd-2.0.1/autogen.sh b/patches/kbd-2.0.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/kbd-2.0.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/kbd-2.0.1/series b/patches/kbd-2.0.1/series
new file mode 100644
index 000000000..3f70cc6ec
--- /dev/null
+++ b/patches/kbd-2.0.1/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
+0002-getkeycode-show-reserved-scancode.patch
+# 4c784c5b9b90253bdc25b499ca23aab6  - git-ptx-patches magic