bcm53xx: refresh patches

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

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 1058aba812699cb1ef243bea03056e4161b3617a..6762c22bc4a6e27a149b36953dcb02c4796a7d52 100755 (executable)
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 ubootenv=""
-nokernel=""
 ubinize_param=""
 kernel=""
 rootfs=""
@@ -57,40 +56,39 @@ ubilayout() {
 }
 
 while [ "$1" ]; do
-       if [ "$1" = "--uboot-env" ]; then
+       case "$1" in
+       "--uboot-env")
                ubootenv="ubootenv"
                shift
                continue
-       fi
-       if [ "$1" = "--no-kernel" ]; then
-               nokernel="nokernel"
-               shift
-               continue
-       fi
-       if [ ! "$kernel" -a ! "$nokernel" ]; then
-               [ "${1:0:1}" = "-" ] && break
-               kernel=$1
-               shift
-               continue
-       fi
-       if [ ! "$rootfs" ]; then
-               [ "${1:0:1}" = "-" ] && break
-               rootfs=$1
+               ;;
+       "--kernel")
+               kernel="$2"
                shift
-               continue
-       fi
-       if [ ! "$outfile" ]; then
-               [ "${1:0:1}" = "-" ] && break
-               outfile=$1
                shift
                continue
-       fi
-       ubinize_param="$@"
-       break
+               ;;
+       "-"*)
+               ubinize_param="$@"
+               break
+               ;;
+       *)
+               if [ ! "$rootfs" ]; then
+                       rootfs=$1
+                       shift
+                       continue
+               fi
+               if [ ! "$outfile" ]; then
+                       outfile=$1
+                       shift
+                       continue
+               fi
+               ;;
+       esac
 done
 
-if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$nokernel" -o ! "$outfile" ]; then
-       echo "syntax: $0 [--no-kernel] [--uboot-env] rootfs [kernel] out [ubinize opts]"
+if [ ! -r "$rootfs" -o ! -r "$kernel" -a ! "$outfile" ]; then
+       echo "syntax: $0 [--uboot-env] [--kernel kernelimage] rootfs out [ubinize opts]"
        exit 1
 fi