ath79: add support of Netgear WNDR3800CH

[openwrt/staging/chunkeey.git] / scripts / ubinize-image.sh

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 1b782a6cdc736b7fb2a0b76aea020b527051d1cf..d82d81432d976cbf0be2d86cfd47fb36420e0d00 100755 (executable)
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+. $TOPDIR/scripts/functions.sh
+
+part=""
 ubootenv=""
 ubinize_param=""
 kernel=""
@@ -7,21 +10,12 @@ rootfs=""
 outfile=""
 err=""
 
-get_magic_word() {
-       dd if=$1 bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
-}
-
-is_ubifs() {
-       if [ "$( get_magic_word $1 )" = "3118" ]; then
-               echo "1"
-       fi
-}
-
 ubivol() {
        volid=$1
        name=$2
        image=$3
        autoresize=$4
+       size="$5"
        echo "[$name]"
        echo "mode=ubi"
        echo "vol_id=$volid"
@@ -29,6 +23,7 @@ ubivol() {
        echo "vol_name=$name"
        if [ "$image" ]; then
                echo "image=$image"
+               [ -n "$size" ] && echo "vol_size=${size}"
        else
                echo "vol_size=1MiB"
        fi
@@ -39,20 +34,51 @@ ubivol() {
 
 ubilayout() {
        local vol_id=0
-       local root_is_ubifs="$( is_ubifs "$2" )"
+       local rootsize=
+       local autoresize=
+       local rootfs_type="$( get_fs_type "$2" )"
+
        if [ "$1" = "ubootenv" ]; then
                ubivol $vol_id ubootenv
                vol_id=$(( $vol_id + 1 ))
                ubivol $vol_id ubootenv2
                vol_id=$(( $vol_id + 1 ))
        fi
+       for part in $parts; do
+               name="${part%%=*}"
+               prev="$part"
+               part="${part#*=}"
+               [ "$prev" = "$part" ] && part=
+
+               image="${part%%=*}"
+               prev="$part"
+               part="${part#*=}"
+               [ "$prev" = "$part" ] && part=
+
+               size="$part"
+
+               ubivol $vol_id "$name" "$image" "" "${size}MiB"
+               vol_id=$(( $vol_id + 1 ))
+       done
        if [ "$3" ]; then
                ubivol $vol_id kernel "$3"
                vol_id=$(( $vol_id + 1 ))
        fi
-       ubivol $vol_id rootfs "$2" $root_is_ubifs
+
+       case "$rootfs_type" in
+       "ubifs")
+               autoresize=1
+               ;;
+       "squashfs")
+               # squashfs uses 1k block size, ensure we do not
+               # violate that
+               rootsize="$( round_up "$( stat -c%s "$2" )" 1024 )"
+               ;;
+       esac
+       ubivol $vol_id rootfs "$2" "$autoresize" "$rootsize"
+
        vol_id=$(( $vol_id + 1 ))
-       [ "$root_is_ubifs" ] || ubivol $vol_id rootfs_data "" 1
+       [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1
 }
 
 while [ "$1" ]; do
@@ -65,6 +91,13 @@ while [ "$1" ]; do
        "--kernel")
                kernel="$2"
                shift
+               shift
+               continue
+               ;;
+       "--part")
+               parts="$parts $2"
+               shift
+               shift
                continue
                ;;
        "-"*)
@@ -87,7 +120,7 @@ while [ "$1" ]; do
 done
 
 if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$outfile" ]; then
-       echo "syntax: $0 [--uboot-env] [--kernel kernelimage] rootfs out [ubinize opts]"
+       echo "syntax: $0 [--uboot-env] [--part <name>=<file>] [--kernel kernelimage] rootfs out [ubinize opts]"
        exit 1
 fi
 
@@ -97,7 +130,11 @@ if [ ! -x "$ubinize" ]; then
        exit 1
 fi
 
-ubinizecfg="$( mktemp )"
+ubinizecfg="$( mktemp 2> /dev/null )"
+if [ -z "$ubinizecfg" ]; then
+       # try OSX signature
+       ubinizecfg="$( mktemp -t 'ubitmp' )"
+fi
 ubilayout "$ubootenv" "$rootfs" "$kernel" > "$ubinizecfg"
 
 cat "$ubinizecfg"
@@ -107,4 +144,3 @@ err="$?"
 rm "$ubinizecfg"
 
 exit $err
-