scripts: ubinize-image.sh: support static volumes, make size optional
[openwrt/staging/jow.git] / scripts / ubinize-image.sh
index c6f8bcefe5e04bc3e3093873f593aa8ab0ada9f2..cd516e8afc5c2d3d6d839914d9579faaefc7dd85 100755 (executable)
@@ -12,15 +12,16 @@ err=""
 ubinize_seq=""
 
 ubivol() {
-       volid=$1
-       name=$2
-       image=$3
-       autoresize=$4
-       size="$5"
+       local volid=$1
+       local name=$2
+       local image=$3
+       local autoresize=$4
+       local size="$5"
+       local voltype="${6:-dynamic}"
        echo "[$name]"
        echo "mode=ubi"
        echo "vol_id=$volid"
-       echo "vol_type=dynamic"
+       echo "vol_type=$voltype"
        echo "vol_name=$name"
        if [ "$image" ]; then
                echo "image=$image"
@@ -38,6 +39,7 @@ ubilayout() {
        local rootsize=
        local autoresize=
        local rootfs_type="$( get_fs_type "$2" )"
+       local voltype
 
        if [ "$1" = "ubootenv" ]; then
                ubivol $vol_id ubootenv
@@ -49,16 +51,26 @@ ubilayout() {
                name="${part%%=*}"
                prev="$part"
                part="${part#*=}"
+               voltype=dynamic
                [ "$prev" = "$part" ] && part=
 
                image="${part%%=*}"
+               if [ "${image:0:1}" = ":" ]; then
+                       voltype=static
+                       image="${image:1}"
+               fi
                prev="$part"
                part="${part#*=}"
                [ "$prev" = "$part" ] && part=
 
                size="$part"
+               if [ -z "$size" ]; then
+                       size="$( round_up "$( stat -c%s "$image" )" 1024 )"
+               else
+                       size="${size}MiB"
+               fi
 
-               ubivol $vol_id "$name" "$image" "" "${size}MiB"
+               ubivol $vol_id "$name" "$image" "" "${size}" "$voltype"
                vol_id=$(( $vol_id + 1 ))
        done
        if [ "$3" ]; then
@@ -66,20 +78,22 @@ ubilayout() {
                vol_id=$(( $vol_id + 1 ))
        fi
 
-       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"
+       if [ "$2" ]; then
+               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" dynamic
 
-       vol_id=$(( $vol_id + 1 ))
-       [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1
+               vol_id=$(( $vol_id + 1 ))
+               [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1 dymamic
+       fi
 }
 
 set_ubinize_seq() {
@@ -101,6 +115,12 @@ while [ "$1" ]; do
                shift
                continue
                ;;
+       "--rootfs")
+               rootfs="$2"
+               shift
+               shift
+               continue
+               ;;
        "--part")
                parts="$parts $2"
                shift
@@ -112,11 +132,6 @@ while [ "$1" ]; do
                break
                ;;
        *)
-               if [ ! "$rootfs" ]; then
-                       rootfs=$1
-                       shift
-                       continue
-               fi
                if [ ! "$outfile" ]; then
                        outfile=$1
                        shift
@@ -126,12 +141,12 @@ while [ "$1" ]; do
        esac
 done
 
-if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$outfile" ]; then
-       echo "syntax: $0 [--uboot-env] [--part <name>=<file>] [--kernel kernelimage] rootfs out [ubinize opts]"
+if [ ! -r "$rootfs" -a ! -r "$kernel" -a ! "$outfile" ]; then
+       echo "syntax: $0 [--uboot-env] [--part <name>=<file>] [--kernel kernelimage] [--rootfs rootfsimage] out [ubinize opts]"
        exit 1
 fi
 
-ubinize="$( which ubinize )"
+ubinize="$( command -v ubinize )"
 if [ ! -x "$ubinize" ]; then
        echo "ubinize tool not found or not usable"
        exit 1