From: Andres Salomon <dilinger@queued.net>
Date: Fri, 19 Nov 2010 20:36:27 +0000 (-0800)
Subject: debxo: drop hal keymapping stuff
X-Git-Tag: v0.6~16
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?p=xodist;a=commitdiff_plain;h=db66c3c25d0e75718cf8218587ecc206c7aba4d4

debxo: drop hal keymapping stuff

Keymappings for OLPC are now handled by udev (and included upstream). In order
for this to work, OFW must have DMI support.  Newer versions of OFW all have it,
so upon detection of an OLPC machine, udev should automatically load the correct
keymap (and it should work properly for both X and console).

If using an older OFW that lacks DMI support, upgrading is recommended.  If
that's not an option, just add something like the following to your
/etc/rc.local (this will force manual loading of the keymaps):

/lib/udev/keymap /dev/input/event0 olpc-xo

Signed-off-by: Andres Salomon <dilinger@queued.net>
---

diff --git a/30-keymap-olpc.fdi b/30-keymap-olpc.fdi
deleted file mode 100644
index dcba46d..0000000
--- a/30-keymap-olpc.fdi
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<!-- sticking this into /usr/share/hal/fdi/information/10freedesktop/ should
-     enable working keys -->
-
-<deviceinfo version="0.2">
-  <device>
-    <!-- These are buttons synthesized in atkbd -->
-    <match key="@input.originating_device:info.linux.driver" string="atkbd">
-          <append key="input.keymap.data" type="strlist">0x65:kp9</append> <!-- Game Key - Up -->
-          <append key="input.keymap.data" type="strlist">0x66:kp3</append> <!-- Game Key - Down -->
-          <append key="input.keymap.data" type="strlist">0x67:kp7</append> <!-- Game Key - Left -->
-          <append key="input.keymap.data" type="strlist">0x68:kp1</append> <!-- Game Key - Right -->
-
-          <append key="input.keymap.data" type="strlist">0xe065:kp8</append> <!-- Game Key - O -->
-          <append key="input.keymap.data" type="strlist">0xe066:kp2</append> <!-- Game Key - X -->
-          <append key="input.keymap.data" type="strlist">0xe067:kp4</append> <!-- Game Key - [] -->
-          <append key="input.keymap.data" type="strlist">0xe068:kp6</append> <!-- Game Key - V -->
-
-          <append key="input.keymap.data" type="strlist">0x73:prog1</append> <!-- mult/div -->
-          <append key="input.keymap.data" type="strlist">0x43:brightnessdown</append> <!-- Backlight Down (F9) -->
-          <append key="input.keymap.data" type="strlist">0x44:brightnessup</append> <!-- Backlight Up (F10) -->
-          <append key="input.keymap.data" type="strlist">0x57:volumedown</append> <!-- Volume Down (F11) -->
-          <append key="input.keymap.data" type="strlist">0x58:volumeup</append> <!-- Volume Up (F12) -->
-
-          <append key="input.keymap.data" type="strlist">0x59:fn</append> <!-- Fn -->
-
-          <append key="input.keymap.data" type="strlist">0xe043:f9</append> <!-- Fn+Backlight Down (F9) -->
-          <append key="input.keymap.data" type="strlist">0xe044:f10</append> <!-- Fn+Backlight Up (F10) -->
-          <append key="input.keymap.data" type="strlist">0xe057:f11</append> <!-- Fn+Volume Down (F11) -->
-          <append key="input.keymap.data" type="strlist">0xe058:f12</append> <!-- Fn+Volume Up (F12) -->
-
-          <append key="input.keymap.data" type="strlist">0xe079:search</append> <!-- Search -->
-          <append key="input.keymap.data" type="strlist">0xe06e:chat</append> <!-- Chat -->
-
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-
-    </match>
-  </device>
-</deviceinfo>
diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks
index 563fe7d..2bd93a6 100644
--- a/configs/debxo-awesome/hooks
+++ b/configs/debxo-awesome/hooks
@@ -88,11 +88,6 @@ EOF
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
-	# key bindings/mappings
-	if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
-		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
-	fi
-
 	# configure nodm
 	F=${ROOT_DIR}/etc/default/nodm
 	if [ -f ${F} ]; then
diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index 441337a..f53bc5d 100644
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -89,11 +89,6 @@ EOF
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
-	# key bindings/mappings
-	if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
-		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
-	fi
-
 	# configure gnome
 	if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
 		cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<<EOF
diff --git a/configs/debxo-kde/hooks b/configs/debxo-kde/hooks
index a73113b..def7f00 100644
--- a/configs/debxo-kde/hooks
+++ b/configs/debxo-kde/hooks
@@ -88,11 +88,6 @@ EOF
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
-	# key bindings/mappings
-	if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
-		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
-	fi
-
 	# configure kdm
 	if [ -d ${ROOT_DIR}/etc/kde3/kdm ]; then
 		sed --in-place "s/AllowNullPasswd=false/AllowNullPasswd=true/;s/#AutoLoginEnable=true/AutoLoginEnable=true/;s/#AutoLoginUser=fred/AutoLoginUser=${DEFUSER}/" ${ROOT_DIR}/etc/kde3/kdm/kdmrc
diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index 563fe7d..2bd93a6 100644
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -88,11 +88,6 @@ EOF
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
-	# key bindings/mappings
-	if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
-		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
-	fi
-
 	# configure nodm
 	F=${ROOT_DIR}/etc/default/nodm
 	if [ -f ${F} ]; then
diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index f7657ae..21ec913 100644
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/hooks
@@ -88,11 +88,6 @@ EOF
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
-	# key bindings/mappings
-	if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
-		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
-	fi
-
 	# configure nodm
 	F=${ROOT_DIR}/etc/default/nodm
 	if [ -f ${F} ]; then
diff --git a/configs/debxo-xfce/hooks b/configs/debxo-xfce/hooks
index 9898939..15b6953 100644
--- a/configs/debxo-xfce/hooks
+++ b/configs/debxo-xfce/hooks
@@ -88,11 +88,6 @@ EOF
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
-	# key bindings/mappings
-	if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
-		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
-	fi
-
 	# configure nodm
 	F=${ROOT_DIR}/etc/default/nodm
 	if [ -f ${F} ]; then