installer: figure out where to install to..

[xodist] / mkjffs2.sh

diff --git a/mkjffs2.sh b/mkjffs2.sh
index a885a24818795160d281800b86058b1e117587f6..7d907f76b25d6cf679f50cf02cb3424224920bb0 100755 (executable)
--- a/mkjffs2.sh
+++ b/mkjffs2.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright © 2008  Andres Salomon <dilinger@queued.net>
+# Copyright © 2008-2009  Andres Salomon <dilinger@collabora.co.uk>
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -16,22 +16,49 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-. functions.sh
+. ./functions.sh
+
+CONFIG_TYPE=generic
 
 usage()
 {
        echo "" 1>&2
-       echo "Usage: $0 <root directory> <img>" 1>&2
+       echo "Usage: $0 [<options>] <root directory> <img>" 1>&2
+       echo "" 1>&2
+       echo "Options:" 1>&2
+       echo "  --config-type <config>    directory name in configs/ to use" 1>&2
+       echo "  --help                    display this help screen" 1>&2
        echo "" 1>&2
        exit 1
 }
 
-if [ "$#" != "2" ]; then
-       usage
-fi
-
-ROOT_DIR=$1
-IMG_NAME=$2
+while test $# != 0
+do
+       case $1 in
+       --config-type)
+               CONFIG_TYPE=$2
+               [ -d ./configs/${CONFIG_TYPE} ] || {
+                       echo "Error: can't find directory './configs/${CONFIG_TYPE}/'!" 1>&2
+                       exit 2
+               }
+               shift
+               ;;
+       --help|-h)
+               usage
+               ;;
+       *)
+               if [ "$#" != "2" ]; then
+                       echo "Unknown option $1" 1>&2
+                       usage
+               else
+                       ROOT_DIR=$1
+                       IMG_NAME=$2
+                       shift
+               fi
+               ;;
+       esac
+       shift
+done
 
 if [ "${IMG_NAME}" == "${IMG_NAME/.img/.dat}" ]; then
        DAT_NAME=${IMG_NAME}.dat
@@ -46,15 +73,25 @@ if [ ! -d "${ROOT_DIR}" ]; then
 fi
 
 check_for_cmds mkfs.jffs2 sumtool || exit 1
-create_fstab ${ROOT_DIR} jffs2
-create_ofwboot ${ROOT_DIR} jffs2
+
+# create image's /etc/fstab
+if [ ! -f ./configs/${CONFIG_TYPE}/fstab-jffs2 ]; then
+       echo "*** Unable to find fstab-jffs2!" 1>&2
+       exit 1
+fi
+sed 's/[[:space:]]#.*//' ./configs/${CONFIG_TYPE}/fstab-jffs2 > ${ROOT_DIR}/etc/fstab
+
+# TODO: this needs to go into an OFW package; here it's a hack
+# create image's /boot/olpc.fth
+if [ -f ./configs/${CONFIG_TYPE}/olpc.fth-jffs2 ]; then
+       cp ./configs/${CONFIG_TYPE}/olpc.fth-jffs2 ${ROOT_DIR}/boot/olpc.fth
+fi
 
 create_jffs2()
 {
        root_dir="$1"
        out="$2"
 
-       # 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 +102,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 2>/dev/null | 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
 }