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

[xodist] / configs / debxo-sugar / hooks

diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index f7657ae048a8f0851a411ce1cf43dcc4f1676ccb..bd42ba7786e3ff045b357e3e1fed3fcb7bf7b6e3 100644 (file)
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/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
 }
 
@@ -88,11 +75,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 nodm
        F=${ROOT_DIR}/etc/default/nodm
        if [ -f ${F} ]; then
@@ -117,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
 }