debxo: update kernel to 2.6.37-rc4+

[xodist] / configs / debxo-kde / hooks

diff --git a/configs/debxo-kde/hooks b/configs/debxo-kde/hooks
index a73113b8eafe11d22f66859332592ba85dba043c..2447db4f56781674d31e6c767084777b4eeba17e 100644 (file)
--- a/configs/debxo-kde/hooks
+++ b/configs/debxo-kde/hooks
@@ -22,27 +22,14 @@ 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
 }
 
@@ -85,13 +72,18 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # 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
+       # 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
 
        # configure kdm
        if [ -d ${ROOT_DIR}/etc/kde3/kdm ]; then
@@ -107,6 +99,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
 }