From: James Cameron <quozl@laptop.org>
Date: Mon, 27 Oct 2008 07:38:44 +0000 (+1100)
Subject: merge lunge
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c17e19589ed1935b4561b18fc700a352d908c97;hp=08922b749b97fa4ae80b172780f546dbc4080fcf;p=xodist

merge lunge
---

diff --git a/initchroot.sh b/initchroot.sh
index 565a18c..18c6e65 100755
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -139,7 +139,7 @@ echo "en_US.UTF-8 UTF-8" >${ROOT_DIR}/etc/locale.gen
 
 k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.2/linux-2.6.25.15_2.6.25.15-144_i386.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.3/linux-2.6.25.15_2.6.25.15-146_i386.deb"
 mkdir -p cache
 for i in $k; do
 	pkg=$(basename ${i})
diff --git a/mkjffs2.sh b/mkjffs2.sh
index e18346e..da53633 100755
--- a/mkjffs2.sh
+++ b/mkjffs2.sh
@@ -53,9 +53,9 @@ create_jffs2()
 {
 	root_dir="$1"
 	out="$2"
-	comp="$3"
 
-	mkfs.jffs2 -n -e128KiB -X${comp} -r ${root_dir} -o ${out}.pre
+	# XXX:  do we want to switch to lzo?  (mkfs.jffs2 -X lzo)
+	mkfs.jffs2 -n -e128KiB -r ${root_dir} -o ${out}.pre
 	sumtool -n -p -e 128KiB -i ${out}.pre -o ${out}
 	rm -f ${out}.pre
 }
@@ -96,14 +96,13 @@ EOF
 
 # create the boot partition
 ln -s . ${ROOT_DIR}/boot/boot
-create_jffs2 ${ROOT_DIR}/boot _boot.img zlib
+create_jffs2 ${ROOT_DIR}/boot _boot.img
 rm -f ${ROOT_DIR}/boot/boot
 
 # create the root partition
 mv ${ROOT_DIR}/boot _boot
 mkdir ${ROOT_DIR}/boot
-create_jffs2 ${ROOT_DIR} _root.img zlib
-# lzo
+create_jffs2 ${ROOT_DIR} _root.img
 rmdir ${ROOT_DIR}/boot
 mv _boot ${ROOT_DIR}/boot