Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Dengler <martin@martindengler.com>2009-06-19 03:26:16 (GMT)
committer Martin Dengler <martin@martindengler.com>2009-06-20 04:02:07 (GMT)
commitcec3560c3b761bbbd23bff0c9eb480312a6d5f18 (patch)
tree5860672b0175277712ad4a15547460bebe2c9cc9
parent8dcaca9b31413e29c7377c551d7a562b5241d270 (diff)
olpc-kbdshim from pgf's rpm
-rw-r--r--soas-xo.ks15
1 files changed, 10 insertions, 5 deletions
diff --git a/soas-xo.ks b/soas-xo.ks
index 7d29535..e0a481b 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -6,9 +6,12 @@ bootchart
fbida
ntpdate
ohm
-olpc-kbdshim
xcompmgr
+# FIXME: uncomment when packaged for F11
+#olpc-kbdshim
+#olpc-powerd
+
%end
%post
@@ -465,6 +468,7 @@ chmod a+r /var/log/messages
mkdir -p $INSTALL_ROOT/var/tmp
cp bits/kernel-2.6.25-20090223.1.olpc.69098d87d56945c.i586.rpm \
bits/kernel-2.6.30-20090605.1.olpc.f3378de.i586.rpm \
+ bits/olpc-kbdshim-6-3.fc9.i386.rpm \
bits/olpc-powerd-7-1.fc9.i386.rpm \
$INSTALL_ROOT/var/tmp
@@ -487,19 +491,20 @@ setarch i386 yum -y update
##################
-# BEGIN install kernels
+# BEGIN install k
#OLPC stable kernel with DCON + PM + OFW
setarch i386 rpm -ivh --force --nodeps /var/tmp/kernel-2.6.25-20090223.1.olpc.69098d87d56945c.i586.rpm
#OLPC development kernel with DCON + PM
-setarch i386 rpm -ivh --force --nodeps /var/tmp/kernel-2.6.30-20090603.1.olpc.415a0ef.i586.rpm
+setarch i386 rpm -ivh --force --nodeps /var/tmp/kernel-2.6.30-*.rpm
# END install kernels
##################
##################
-# BEGIN install olpc-powerd
-setarch i386 rpm -ivh /var/tmp/ololpc-powerd-7-1.fc9.i386.rpm
+# BEGIN install olpc-powerd and kbdshim
+setarch i386 rpm -ivh /var/tmp/olpc-powerd-7-1.fc9.i386.rpm
+setarch i386 rpm -ivh /var/tmp/olpc-kbdshim-6-3.fc9.i386.rpm
# END install olpc-powerd
##################