Re: [ptxdist] [PATCH v3 1/4] kbd: rework and version bump 1.15.2 -> 2.0.1

[Alexander Aring <alex.aring@gmail.com>]

Hi Michael,

please drop this series. My current workflow failed in this patch.

On Tue, Jun 17, 2014 at 05:11:21AM +0200, Alexander Aring wrote:
> 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>
> ---
> changes since v3:
>  - really fix whitespace issues with right intend
> 
> Changes since v2:
>  - use absoulte path in install_link
>  - remove wrong install_link call
>  - fix whitespace issue
>  - remove the removal of tests/Makefile in patch 0001
>  - use && after change directory
> 
>  .../0001-getkeycode-show-reserved-scancode.patch   |  33 -----
>  patches/kbd-1.15.2/series                          |   1 -
>  ...configure-don-t-depend-on-check-for-tests.patch |  43 ++++++
>  .../0002-getkeycode-show-reserved-scancode.patch   |  34 +++++
>  patches/kbd-2.0.1/autogen.sh                       |   1 +
>  patches/kbd-2.0.1/series                           |   2 +
>  rules/kbd.in                                       | 153 +++++++++++++++++++--
>  rules/kbd.make                                     |  87 ++++++++----
>  8 files changed, 282 insertions(+), 72 deletions(-)
>  delete mode 100644 patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
>  delete mode 100644 patches/kbd-1.15.2/series
>  create mode 100644 patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
>  create mode 100644 patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
>  create mode 120000 patches/kbd-2.0.1/autogen.sh
>  create mode 100644 patches/kbd-2.0.1/series
> 
> diff --git a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch b/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> deleted file mode 100644
> index de0c9f8..0000000
> --- a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -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
> -
> -The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
> -However, the scancode can still be used in some special cases, e.g. for a matrix
> -keypad with board specific combination of keycodes and scancodes. This one
> -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>
> ----
> - src/getkeycodes.c |    2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/src/getkeycodes.c b/src/getkeycodes.c
> -index 6504e7e..2ea5298 100644
> ---- a/src/getkeycodes.c
> -+++ b/src/getkeycodes.c
> -@@ -47,7 +47,7 @@ main(int argc, char **argv) {
> - 		old_kernel = 1;
> - 		sc0 = 89;
> - 	} else
> --	for (sc0 = 1; sc0 <= 88; sc0++) {
> -+	for (sc0 = 0; sc0 <= 88; sc0++) {
> - 		a.scancode = sc0;
> - 		a.keycode = 0;
> - 		if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
> --- 
> -1.7.1
> -
> diff --git a/patches/kbd-1.15.2/series b/patches/kbd-1.15.2/series
> deleted file mode 100644
> index d6cc8bd..0000000
> --- 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 0000000..40b695c
> --- /dev/null
> +++ b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> @@ -0,0 +1,43 @@
> +From 8768291208c4a11139efd2c4ae7bf139a2032998 Mon Sep 17 00:00:00 2001
> +From: Alexander Aring <alex.aring@gmail.com>
> +Date: Sun, 15 Jun 2014 15:48:20 +0200
> +Subject: [PATCH v3 1/2] Makefile: configure: don't depend on check for tests

here, the v3 was substitute from one of my workflow scripts.

> +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 89c7e83..beb6e29 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 960cc07..b9879ad 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])
> + 
> +-- 
> +2.0.0
> +
> diff --git a/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> new file mode 100644
> index 0000000..3ee283a
> --- /dev/null
> +++ b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> @@ -0,0 +1,34 @@
> +From fea29f0fe8cb8e097d64b4b1152038d6c2ffa028 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 v3 2/2] getkeycode: show reserved scancode
> +

and here.

Sorry.

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de