debxo: drop apt hack to work around jffs2's lack of mmap

[xodist] / configs / debxo-gnome / hooks

diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index 441337a59fd04ede69bd738fea23b2051760f391..c3eb6defe52cefa9dd21171e22b9ec91ba8dc397 100644 (file)
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -24,26 +24,13 @@ customize_chroot_hook()
        # 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
 }
 
@@ -89,11 +76,6 @@ EOF
        # 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
-
        # configure gnome
        if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
                cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<<EOF
@@ -118,6 +100,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
 }