debxo: update kernel to 2.6.37-rc4+

[xodist] / configs / debxo-lxde / hooks

diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index d1cc47ef60f67a541a69eb97f288e57275373da7..d72a3d635ea59b00130c347cf3b3b6ef8eb7bd3a 100644 (file)
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -22,31 +22,15 @@ customize_chroot_hook()
        # Any customizations that need to be made to the chroot after the base system
        # has been installed (but prior to custom package installation) should be
        # 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>).
-       mkdir ${ROOT_DIR}/var/cache/apt/cache
-       mount -t tmpfs tmpfs ${ROOT_DIR}/var/cache/apt/cache
-       # XOs are slow and small; don't use pdiffs, don't install recommends, and
-       # work around lack of mmap.
+       # XOs are slow and small; don't use pdiffs and don't install recommends
 cat >${ROOT_DIR}/etc/apt/apt.conf<<EOF
 Acquire::Pdiffs "false";
 APT::Install-Recommends "false";
-Dir {
-       Cache "var/cache/apt/" {
-               srcpkgcache "cache/srcpkgcache.bin";
-               pkgcache "cache/pkgcache.bin";
-       };
-};
 EOF
-
-       # add archive key for lenny-backports
-       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -67,12 +51,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/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/autox_0.1_all.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.6/linux-image-2.6.37-rc4+_2.6.37-rc4+-56_i386.deb"
        mkdir -p cache
        for i in $k; do
                pkg=$(basename ${i})
@@ -84,21 +72,37 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # take some packages that are okay to upgrade off hold
-       echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
-
-       # No longer a need for xorg.conf
-       rm -f ${ROOT_DIR}/etc/X11/xorg.conf
+       # Create an Xorg.conf that overrides the default DPI (x bug workaround).
+       cat >${ROOT_DIR}/etc/X11/xorg.conf<<EOF
+Section "Monitor"
+       Identifier "Monitor0"
+       DisplaySize 200 150
+EndSection
+
+Section "Screen"
+       Identifier "Default Screen"
+       Monitor "Monitor0"
+EndSection
+EOF
 
-       # 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/
+       # configure nodm
+       F=${ROOT_DIR}/etc/default/nodm
+       if [ -f ${F} ]; then
+               sed --in-place "s/NODM_USER=.*$/NODM_USER=${DEFUSER}/" ${F}
+               sed --in-place "s/NODM_ENABLED=.*$/NODM_ENABLED=true/" ${F}
        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 wicd
+       F=${ROOT_DIR}/etc/wicd/manager-settings.conf
+       # there's no actual config file in the package; it's autocreated or something.  ugh.
+       cp wicd-manager-settings.conf ${F}
+#      if [ -f ${F} ]; then
+#              sed --in-place "s/wireless_interface =.*$/wireless_interface = wlan0/" ${F}
+#              sed --in-place "s/wired_inferface =.*$/wired_interface = eth0/" ${F}
+#              # auto-connect to wired
+#              sed --in-place "s/prefer_wired =.*$/prefer_wired = True/" ${F}
+#              sed --in-place "s/wired_connect_mode =.*$/wired_connect_mode = 0/" ${F}
+#      fi
 
 }
 
@@ -109,6 +113,4 @@ cleanup_chroot_hook()
        # Any customizations that need to be made after the chroot creation is
        # complete should be put here.  $ROOT_DIR should be prefixed to any
        # paths.
-
-       umount ${ROOT_DIR}/var/cache/apt/cache
 }