Revert "mkjffs2: add lzo support"

This reverts commit f55f2955de650777ef99dd2de4aaa8607dc9f3c8.

Conflicts:

	initchroot.sh

Signed-off-by: Andres Salomon <dilinger@debian.org>

diff --git a/mkjffs2.sh b/mkjffs2.sh
index e18346e6ef69e1681be631a86e3cf04a115c0907..da53633e06ee37c9dd0997f666d4a8c3e97eb44b 100755 (executable)
--- 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