install 30-keymap-olpc.fdi from git directly (again)

1 files changed, 9 insertions, 98 deletions

diff --git a/soas-xo.ks b/soas-xo.ks
index 1ea5ea1..21a11f3 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -30,104 +30,6 @@ yum-presto
 %post
 
 
-# olpc-utils ships 30-keymap-olpc.fdi, but we don't want all that olpc-utils brings
-cat > /etc/hal/fdi/information/30-keymap-olpc.fdi <<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-  <device>
-
-    <match key="@input.originating_device:info.linux.driver" string="atkbd">
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="OLPC">
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="XO">
-        <append key="input.keymap.data" type="strlist">59:fn</append>
-        <append key="input.keymap.data" type="strlist">e001:fn_esc</append>
-
-        <append key="input.keymap.data" type="strlist">e079:camera</append>
-        <!-- FN-CAMERA is 'Mic', KEY_SOUND is as close as I see. -->
-        <append key="input.keymap.data" type="strlist">e078:sound</append>
-
-        <append key="input.keymap.data" type="strlist">e03b:fn_f1</append>
-        <append key="input.keymap.data" type="strlist">e03c:fn_f2</append>
-        <append key="input.keymap.data" type="strlist">e03d:fn_f3</append>
-        <append key="input.keymap.data" type="strlist">e03e:fn_f4</append>
-        <append key="input.keymap.data" type="strlist">e03f:fn_f5</append>
-        <append key="input.keymap.data" type="strlist">e040:fn_f6</append>
-        <append key="input.keymap.data" type="strlist">e041:fn_f7</append>
-        <append key="input.keymap.data" type="strlist">e042:fn_f8</append>
-        <append key="input.keymap.data" type="strlist">e043:fn_f9</append>
-        <append key="input.keymap.data" type="strlist">e044:fn_f10</append>
-        <append key="input.keymap.data" type="strlist">e057:fn_f11</append>
-        <append key="input.keymap.data" type="strlist">e058:fn_f12</append>
-
-        <!-- Using KEY_F13-KEY_F21 for the .5 F keys right now. -->
-        <append key="input.keymap.data" type="strlist">e077:fn_f13</append>
-        <append key="input.keymap.data" type="strlist">e076:fn_f14</append>
-        <append key="input.keymap.data" type="strlist">e075:fn_f15</append>
-        <append key="input.keymap.data" type="strlist">e074:fn_f16</append>
-        <append key="input.keymap.data" type="strlist">e073:fn_f17</append>
-        <append key="input.keymap.data" type="strlist">e072:fn_f18</append>
-        <append key="input.keymap.data" type="strlist">e071:fn_f19</append>
-        <append key="input.keymap.data" type="strlist">e070:fn_f20</append>
-        <append key="input.keymap.data" type="strlist">e06f:fn_f21</append>
-
-        <append key="input.keymap.data" type="strlist">e06e:chat</append>
-        <!-- FIXME: FN-CHAT, just mapping to KEY_CHAT right now -->
-        <append key="input.keymap.data" type="strlist">e064:chat</append>
-
-        <!-- Frame and Fn-frame , which is listed as 'Win App', try -->
-        <append key="input.keymap.data" type="strlist">e05d:menu</append>
-        <append key="input.keymap.data" type="strlist">e05a:prog1</append> 
-
-        <!-- The FN of some keys is other keys -->
-        <append key="input.keymap.data" type="strlist">e053:delete</append> 
-        <append key="input.keymap.data" type="strlist">e052:insert</append> 
-        <append key="input.keymap.data" type="strlist">e049:pageup</append> 
-        <append key="input.keymap.data" type="strlist">e051:pagedown</append> 
-        <append key="input.keymap.data" type="strlist">e047:home</append> 
-        <append key="input.keymap.data" type="strlist">e04f:end</append> 
-
-        <!-- FIXME: These should be the language key. Don't ask what they
-             are doing as KEY_HP. It will make your brain hurt. -->
-        <append key="input.keymap.data" type="strlist">73:hp</append>
-        <append key="input.keymap.data" type="strlist">7e:hp</append>
-
-        <!-- L/R grab -->
-        <append key="input.keymap.data" type="strlist">e05b:leftmeta</append>
-        <append key="input.keymap.data" type="strlist">e05c:rightmeta</append>
-        <!-- FIXME: right grab seems to be releasing on a different scancode -->
-        <append key="input.keymap.data" type="strlist">85:rightmeta</append> 
-
-        <!-- Fn-space toggles the backlight.
-             At least in a dream I had last night. -->
-        <append key="i
100  5121  100  5121    0     0   8391      0 --:--:-- --:--:-- --:--:-- 10345
-nput.keymap.data" type="strlist">e056:kbdillumtoggle</append> 
-
-        <!-- Set the game keys to map to up/down/left/right for now -->
-        <append key="input.keymap.data" type="strlist">65:kp8</append> 
-        <append key="input.keymap.data" type="strlist">66:kp2</append> 
-        <append key="input.keymap.data" type="strlist">67:kp4</append> 
-        <append key="input.keymap.data" type="strlist">68:kp6</append> 
-
-        <!-- set the other game keys to map to pgup/pgdn/home/end -->
-        <append key="input.keymap.data" type="strlist">e065:kp9</append> 
-        <append key="input.keymap.data" type="strlist">e066:kp3</append> 
-        <append key="input.keymap.data" type="strlist">e067:kp7</append> 
-        <append key="input.keymap.data" type="strlist">e068:kp1</append> 
-
-        <append key="input.keymap.data" type="strlist">69:switchvideomode</append>
-
-        <append key="info.capabilities" type="strlist">input.keymap</append>
-
-      </match>
-      </match>
-
-    </match>
-  </device>
-</deviceinfo>
-EOF
-
-
 # help OOM killer by changing Rainbow and tmpfs parameters per m_stone/cscott
 sed -i -e "185s/''/'size=1M,nr_inodes=1024'/" /usr/lib/python2.*/site-packages/rainbow/inject.py
 sed -i -e 's/RW_OPTIONS=/RW_OPTIONS="-o size=1M -o nr_inodes=1024"/' /etc/sysconfig/readonly-root
@@ -375,6 +277,15 @@ FOE
 %end
 
 
+%post --nochroot
+
+# olpc-utils ships 30-keymap-olpc.fdi, but we don't want all that olpc-utils brings
+# FIXME: can be removed when https://bugzilla.redhat.com/show_bug.cgi?id=514081 is resolved better
+curl -4 http://dev.laptop.org/git/projects/olpc-utils/plain/etc/hal/fdi/information/30-keymap-olpc.fdi >> $INSTALL_ROOT/etc/hal/fdi/information/30-keymap-olpc.fdi
+
+%end
+
+
 # install olpc kernel (again...this is a terrible kludge)
 # FIXME: remove when it's clear why non-OLPC kernel's being installed
 #        (and installed second)