debxo: update to a newer kernel

[xodist] / configs / debxo-gnome / hooks

diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index 7921733c3ff5e705dfd3b96b4cf3623068fc2edc..d7caf6a1e1130b335662e08e68983f30a30a228a 100644 (file)
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -25,6 +25,9 @@ customize_chroot_hook()
        # put here.  $ROOT_DIR should be prefixed to any paths.
        
        mkdir ${ROOT_DIR}/ofw
+
+       # OFW needs this to boot w/ partitions
+       ln -s . ${ROOT_DIR}/boot/boot
        
        # Apt can't deal w/ jffs2's lack of mmap, so we keep apt's cache on tmpfs
        # (see <http://bugs.debian.org/314334>).
@@ -43,7 +46,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -64,14 +68,16 @@ scx200_acb
 i8042
 olpc_battery
 msr
+EOF
+
+       # UBIFS needs this
+       cat >>${ROOT_DIR}/etc/initramfs-tools/modules<<EOF
+ubi mtd=root
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.6/linux-image-2.6.37-rc1+_2.6.37-rc1+-47_i386.deb"
        mkdir -p cache
        for i in $k; do
                pkg=$(basename ${i})
@@ -83,10 +89,6 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
-       echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
-
        # No longer a need for xorg.conf
        rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
@@ -95,11 +97,6 @@ EOF
                cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
        fi
 
-       # configure autox
-       if [ -f ${ROOT_DIR}/etc/default/autox ]; then
-               sed --in-place "s/USER=$/USER=${DEFUSER}/" ${ROOT_DIR}/etc/default/autox
-       fi
-
        # configure gnome
        if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
                cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<<EOF
@@ -110,6 +107,11 @@ EOF
                cp %gconf-tree.xml ${ROOT_DIR}/etc/gconf/debxo.xml.defaults/
        fi
 
+       # configure gdm
+       if [ -d ${ROOT_DIR}/etc/gdm ]; then
+               sed -i "s_\[daemon\]_\[daemon\]\n\nGreeter=/usr/lib/gdm/gdmlogin\n\nAutomaticLoginEnable=true\n\nAutomaticLogin=${DEFUSER}_" ${ROOT_DIR}/etc/gdm/gdm.conf
+       fi
+
 }
 
 cleanup_chroot_hook()