reinstate linux-libc-headers keyboard.patch, following apparent arbitrary removal in 2.6.8.1 upgrade

BKrev: 41a22a3cVnvEzp-4-Vhmo-llAOMb0w

3 files changed, 3 insertions, 80 deletions

diff --git a/linux-libc-headers/files/keyboard.patch b/linux-libc-headers/files/keyboard.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux-libc-headers/files/keyboard.patch
diff --git a/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch b/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch
deleted file mode 100644
index 7df00418b1..0000000000
--- a/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- kernel/include/linux/keyboard.h	2004-01-17 23:04:30.000000000 +0000
-+++ kernel/include/linux/keyboard.h	2004-08-30 12:49:41.000000000 +0100
-@@ -37,6 +44,8 @@
- #define KT_ASCII	9
- #define KT_LOCK		10
- #define KT_SLOCK	12
-+#define KT_X		13	/* A few useful symbols from the base X Keysym set, that go with... */
-+#define KT_XF		14	/* The XFree86 Internet multimedia and PDA keyboard symbols */
- 
- #define K(t,v)		(((t)<<8)|(v))
- #define KTYP(x)		((x) >> 8)
-@@ -421,4 +430,66 @@
- #define NR_LOCK		8
- 
- #define MAX_DIACR	256
-+
-+/*
-+ * modifications to this section of this list should be coordinated with
-+ * the X Window System keysym list; life is much easier that way
-+ *
-+ */
-+
-+/* These don't correspond identically. */
-+#define K_XMENU 		K(KT_X, 0x1)
-+#define K_XTELEPHONE		K(KT_X, 0x2)
-+
-+/*
-+ * XFree86 vendor specific keysyms.
-+ *
-+ * These map to XFree86 X keysym range is 0x1008FF01 - 0x1008FFFF;
-+ * for simplicity's sake, we'll define a simple identity mapping for these.
-+ *
-+ * Please coordinate changes here with XFree86.org, so this simple
-+ * identity mapping can be maintained (and old code "just works").
-+ *
-+ * Keys found on some "Internet" keyboards.
-+ */
-+#define K_XFSTANDBY		K(KT_XF,0x10)
-+#define K_XFAUDIOLOWERVOLUME	K(KT_XF,0x11)
-+#define K_XFAUDIOMUTE		K(KT_XF,0x12)
-+#define K_XFAUDIORAISEVOLUME	K(KT_XF,0x13)
-+#define K_XFAUDIOPLAY		K(KT_XF,0x14)
-+#define K_XFAUDIOSTOP		K(KT_XF,0x15)
-+#define K_XFAUDIOPREV		K(KT_XF,0x16)
-+#define K_XFAUDIONEXT		K(KT_XF,0x17)
-+#define K_XFHOMEPAGE		K(KT_XF,0x18)
-+#define K_XFMAIL		K(KT_XF,0x19)
-+#define K_XFSTART		K(KT_XF,0x1A)
-+#define K_XFSEARCH		K(KT_XF,0x1B)
-+#define K_XFAUDIORECORD		K(KT_XF,0x1C)
-+
-+/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
-+#define K_XFCALCULATOR		K(KT_XF,0x1D)
-+#define K_XFMEMO		K(KT_XF,0x1E)
-+#define K_XFTODOLIST		K(KT_XF,0x1F)
-+#define K_XFCALENDAR		K(KT_XF,0x20)
-+#define K_XFPOWERDOWN		K(KT_XF,0x21)
-+#define K_XFCONTRASTADJUST	K(KT_XF,0x22)
-+#define K_XFROCKERUP		K(KT_XF,0x23)
-+#define K_XFROCKERDOWN		K(KT_XF,0x24)
-+#define K_XFROCKERENTER		K(KT_XF,0x25)
-+
-+/* Some more "Internet" keyboard symbols */
-+#define K_XFBACK		K(KT_XF,0x26)
-+#define K_XFFORWARD		K(KT_XF,0x27)
-+#define K_XFSTOP		K(KT_XF,0x28)
-+#define K_XFREFRESH		K(KT_XF,0x29)
-+
-+/* Some more ... */
-+#define K_XFFAVORITES		K(KT_XF,0x30)
-+#define K_XFAUDIOPAUSE		K(KT_XF,0x31)
-+#define K_XFAUDIOMEDIA		K(KT_XF,0x32)
-+#define K_XFMYCOMPUTER		K(KT_XF,0x33)
-+#define K_XFVENDORHOME		K(KT_XF,0x34)
-+#define K_XFLIGHTBULB		K(KT_XF,0x35)
-+#define K_XFSHOP		K(KT_XF,0x36)
-+
- #endif
diff --git a/linux-libc-headers/linux-libc-headers_2.6.8.1.oe b/linux-libc-headers/linux-libc-headers_2.6.8.1.oe
index 415f5feb66..1630e99dc1 100644
--- a/linux-libc-headers/linux-libc-headers_2.6.8.1.oe
+++ b/linux-libc-headers/linux-libc-headers_2.6.8.1.oe
@@ -2,13 +2,14 @@ SECTION = "devel"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r4"
+PR = "r5"
 
 # NOTE: no need to package these headers, since the c library includes them.
 PACKAGES = ""
 
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
-	file://mips-asm-atomic-system.diff;patch=1;pnum=0"
+	file://mips-asm-atomic-system.diff;patch=1;pnum=0 \
+	file://keyboard.patch;patch=1"
 	
 S = "${WORKDIR}/linux-libc-headers-${PV}"