scripts/download.pl: Remove stale download sites and convert to https

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

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index d82d81432d976cbf0be2d86cfd47fb36420e0d00..323eae547abc1a9d4d3d5fca8dc52d8abbf06be8 100755 (executable)
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -9,6 +9,7 @@ kernel=""
 rootfs=""
 outfile=""
 err=""
+ubinize_seq=""
 
 ubivol() {
        volid=$1
@@ -65,20 +66,28 @@ 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"
+
+               vol_id=$(( $vol_id + 1 ))
+               [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1
+       fi
+}
 
-       vol_id=$(( $vol_id + 1 ))
-       [ "$rootfs_type" = "ubifs" ] || ubivol $vol_id rootfs_data "" 1
+set_ubinize_seq() {
+       if [ -n "$SOURCE_DATE_EPOCH" ] ; then
+               ubinize_seq="-Q $SOURCE_DATE_EPOCH"
+       fi
 }
 
 while [ "$1" ]; do
@@ -94,6 +103,12 @@ while [ "$1" ]; do
                shift
                continue
                ;;
+       "--rootfs")
+               rootfs="$2"
+               shift
+               shift
+               continue
+               ;;
        "--part")
                parts="$parts $2"
                shift
@@ -105,11 +120,6 @@ while [ "$1" ]; do
                break
                ;;
        *)
-               if [ ! "$rootfs" ]; then
-                       rootfs=$1
-                       shift
-                       continue
-               fi
                if [ ! "$outfile" ]; then
                        outfile=$1
                        shift
@@ -119,12 +129,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
@@ -137,8 +147,9 @@ if [ -z "$ubinizecfg" ]; then
 fi
 ubilayout "$ubootenv" "$rootfs" "$kernel" > "$ubinizecfg"
 
+set_ubinize_seq
 cat "$ubinizecfg"
-ubinize -o "$outfile" $ubinize_param "$ubinizecfg"
+ubinize $ubinize_seq -o "$outfile" $ubinize_param "$ubinizecfg"
 err="$?"
 [ ! -e "$outfile" ] && err=2
 rm "$ubinizecfg"