add xterm for erikg

[xodist] / mkjffs2.sh

diff --git a/mkjffs2.sh b/mkjffs2.sh
index e18346e6ef69e1681be631a86e3cf04a115c0907..3153795c6f9f11e9e6c1c84b86952b9dcb03c230 100755 (executable)
--- a/mkjffs2.sh
+++ b/mkjffs2.sh
@@ -16,6 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# see the update-nand format definition
+# http://wiki.laptop.org/go/OFW_NAND_FLASH_Updater
+
 . functions.sh
 
 usage()
@@ -53,9 +56,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
 }
@@ -65,7 +68,7 @@ do_sha256()
        f=$1
        eblocks=$((`stat --printf "%s\n" $f` / (128*1024)))
        for b in $(seq 0 $(($eblocks - 1))); do
-               sha=$(dd status=noxfer bs=128KiB skip=$b count=1 if=$f | sha256sum | cut -d- -f1)
+               sha=$(dd status=noxfer bs=128KiB skip=$b count=1 if=$f 2>/dev/null | sha256sum | cut -d- -f1)
                echo "eblock: `printf '%x' $b` sha256 $sha" >> ${IMG_NAME}
        done
 }
@@ -96,14 +99,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