1
0
mirror of https://git.yoctoproject.org/poky synced 2026-07-16 15:57:04 +00:00

upgrade hal to 0.5.11 and hal-info to 20080508(from OE)

This commit is contained in:
Vivian Zhang
2008-11-12 14:15:50 +08:00
committed by Richard Purdie
parent 1eb0272280
commit fdc8250625
7 changed files with 184 additions and 0 deletions
@@ -0,0 +1,29 @@
diff --git a/configure.in b/configure.in
index e76ff51..5e8cc21 100644
--- a/configure.in
+++ b/configure.in
@@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header],
[Use an given Linux input.h rather than that installed on the system (<linux/input.h>)]))
if test "x$with_linux_input_header" != "x"; then
AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>])
+ LINUX_INPUT_H=$with_linux_input_header
+ AC_SUBST(LINUX_INPUT_H)
+else
+ LINUX_INPUT_H=/usr/include/linux/input.h
+ AC_SUBST(LINUX_INPUT_H)
fi
dnl
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ae03edd..7d1cbab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -79,7 +79,7 @@ endif
if BUILD_KEYMAPS
if HAVE_GPERF
-hal-setup-keymap-keys.txt: /usr/include/linux/input.h
+hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt