From: Andres Salomon <dilinger@queued.net>
Date: Fri, 19 Nov 2010 22:04:48 +0000 (-0800)
Subject: debxo: drop apt hack to work around jffs2's lack of mmap
X-Git-Tag: v0.6~14
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ace899c2bc164466eeb0c9124bde428a899841eb;p=xodist

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

We're no longer bothering to build jffs2 images; drop the jffs2
hacks.

Signed-off-by: Andres Salomon <dilinger@queued.net>
---

diff --git a/configs/debxo-awesome/fstab-ext3 b/configs/debxo-awesome/fstab-ext3
index 3f232be..cfa7c1f 100644
--- a/configs/debxo-awesome/fstab-ext3
+++ b/configs/debxo-awesome/fstab-ext3
@@ -3,4 +3,3 @@
 # <file system>	<mount point>	<type>	<options>	<dump>	<pass>
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 LABEL=DebXO	/		ext3	errors=remount-ro 0	1	# 1024
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-awesome/fstab-ubifs b/configs/debxo-awesome/fstab-ubifs
index 052a5d5..dd3a20d 100644
--- a/configs/debxo-awesome/fstab-ubifs
+++ b/configs/debxo-awesome/fstab-ubifs
@@ -4,4 +4,3 @@
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
 ubi:root	/		ubifs	defaults,noatime 1	1
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks
index 3d8ed1a..c207995 100644
--- a/configs/debxo-awesome/hooks
+++ b/configs/debxo-awesome/hooks
@@ -26,21 +26,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -102,6 +91,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
 }
diff --git a/configs/debxo-gnome/fstab-ext3 b/configs/debxo-gnome/fstab-ext3
index 3f232be..cfa7c1f 100644
--- a/configs/debxo-gnome/fstab-ext3
+++ b/configs/debxo-gnome/fstab-ext3
@@ -3,4 +3,3 @@
 # <file system>	<mount point>	<type>	<options>	<dump>	<pass>
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 LABEL=DebXO	/		ext3	errors=remount-ro 0	1	# 1024
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-gnome/fstab-ubifs b/configs/debxo-gnome/fstab-ubifs
index 052a5d5..dd3a20d 100644
--- a/configs/debxo-gnome/fstab-ubifs
+++ b/configs/debxo-gnome/fstab-ubifs
@@ -4,4 +4,3 @@
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
 ubi:root	/		ubifs	defaults,noatime 1	1
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index 4c1b4bb..c3eb6de 100644
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -27,21 +27,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -111,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
 }
diff --git a/configs/debxo-kde/fstab-ext3 b/configs/debxo-kde/fstab-ext3
index 3f232be..cfa7c1f 100644
--- a/configs/debxo-kde/fstab-ext3
+++ b/configs/debxo-kde/fstab-ext3
@@ -3,4 +3,3 @@
 # <file system>	<mount point>	<type>	<options>	<dump>	<pass>
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 LABEL=DebXO	/		ext3	errors=remount-ro 0	1	# 1024
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-kde/fstab-ubifs b/configs/debxo-kde/fstab-ubifs
index 052a5d5..dd3a20d 100644
--- a/configs/debxo-kde/fstab-ubifs
+++ b/configs/debxo-kde/fstab-ubifs
@@ -4,4 +4,3 @@
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
 ubi:root	/		ubifs	defaults,noatime 1	1
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-kde/hooks b/configs/debxo-kde/hooks
index 527126a..16c0f70 100644
--- a/configs/debxo-kde/hooks
+++ b/configs/debxo-kde/hooks
@@ -26,21 +26,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -100,6 +89,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
 }
diff --git a/configs/debxo-lxde/fstab-ext3 b/configs/debxo-lxde/fstab-ext3
index 3f232be..cfa7c1f 100644
--- a/configs/debxo-lxde/fstab-ext3
+++ b/configs/debxo-lxde/fstab-ext3
@@ -3,4 +3,3 @@
 # <file system>	<mount point>	<type>	<options>	<dump>	<pass>
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 LABEL=DebXO	/		ext3	errors=remount-ro 0	1	# 1024
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-lxde/fstab-ubifs b/configs/debxo-lxde/fstab-ubifs
index 052a5d5..dd3a20d 100644
--- a/configs/debxo-lxde/fstab-ubifs
+++ b/configs/debxo-lxde/fstab-ubifs
@@ -4,4 +4,3 @@
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
 ubi:root	/		ubifs	defaults,noatime 1	1
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index e233740..371fc8e 100644
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -26,21 +26,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -102,6 +91,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
 }
diff --git a/configs/debxo-sugar/fstab-ext3 b/configs/debxo-sugar/fstab-ext3
index 3f232be..cfa7c1f 100644
--- a/configs/debxo-sugar/fstab-ext3
+++ b/configs/debxo-sugar/fstab-ext3
@@ -3,4 +3,3 @@
 # <file system>	<mount point>	<type>	<options>	<dump>	<pass>
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 LABEL=DebXO	/		ext3	errors=remount-ro 0	1	# 1024
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-sugar/fstab-ubifs b/configs/debxo-sugar/fstab-ubifs
index 052a5d5..dd3a20d 100644
--- a/configs/debxo-sugar/fstab-ubifs
+++ b/configs/debxo-sugar/fstab-ubifs
@@ -4,4 +4,3 @@
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
 ubi:root	/		ubifs	defaults,noatime 1	1
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index 7ae367e..bd42ba7 100644
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/hooks
@@ -26,21 +26,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -110,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
 }
diff --git a/configs/debxo-xfce/fstab-ext3 b/configs/debxo-xfce/fstab-ext3
index 3f232be..cfa7c1f 100644
--- a/configs/debxo-xfce/fstab-ext3
+++ b/configs/debxo-xfce/fstab-ext3
@@ -3,4 +3,3 @@
 # <file system>	<mount point>	<type>	<options>	<dump>	<pass>
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 LABEL=DebXO	/		ext3	errors=remount-ro 0	1	# 1024
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-xfce/fstab-ubifs b/configs/debxo-xfce/fstab-ubifs
index 052a5d5..dd3a20d 100644
--- a/configs/debxo-xfce/fstab-ubifs
+++ b/configs/debxo-xfce/fstab-ubifs
@@ -4,4 +4,3 @@
 proc		/proc		proc	defaults	0	0	# <partition size in MB>
 mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
 ubi:root	/		ubifs	defaults,noatime 1	1
-tmpfs		/var/cache/apt/cache tmpfs defaults	0	0
diff --git a/configs/debxo-xfce/hooks b/configs/debxo-xfce/hooks
index 972119e..d54080b 100644
--- a/configs/debxo-xfce/hooks
+++ b/configs/debxo-xfce/hooks
@@ -26,21 +26,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -102,6 +91,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
 }