summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/hal/files/hal-right-input-h.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/hal/files/hal-right-input-h.patch')
-rw-r--r--meta/recipes-support/hal/files/hal-right-input-h.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-support/hal/files/hal-right-input-h.patch b/meta/recipes-support/hal/files/hal-right-input-h.patch
deleted file mode 100644
index 06697ed19d..0000000000
--- a/meta/recipes-support/hal/files/hal-right-input-h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff --git a/configure.in b/configure.in
4index e76ff51..5e8cc21 100644
5--- a/configure.in
6+++ b/configure.in
7@@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header],
8 [Use an given Linux input.h rather than that installed on the system (<linux/input.h>)]))
9 if test "x$with_linux_input_header" != "x"; then
10 AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>])
11+ LINUX_INPUT_H=$with_linux_input_header
12+ AC_SUBST(LINUX_INPUT_H)
13+else
14+ LINUX_INPUT_H=/usr/include/linux/input.h
15+ AC_SUBST(LINUX_INPUT_H)
16 fi
17
18 dnl
19diff --git a/tools/Makefile.am b/tools/Makefile.am
20index ae03edd..7d1cbab 100644
21--- a/tools/Makefile.am
22+++ b/tools/Makefile.am
23@@ -79,7 +79,7 @@ endif
24 if BUILD_KEYMAPS
25
26 if HAVE_GPERF
27-hal-setup-keymap-keys.txt: /usr/include/linux/input.h
28+hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
29 awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
30
31 hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt