X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fubinize-image.sh;h=b87cbb48dc8cc004d754e3b9c8001beb5f111393;hb=6b6932537e033b0415cb23500f57c02ad5bdc642;hp=6ffedc5f32620deec6c9de494001fa59a32638be;hpb=b200c07469291f400cd350fb5ab84573e5741829;p=openwrt.git

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 6ffedc5f32..b87cbb48dc 100755
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 ubootenv=""
-nokernel=""
 ubinize_param=""
 kernel=""
 rootfs=""
@@ -63,8 +62,9 @@ while [ "$1" ]; do
 		shift
 		continue
 		;;
-	"--no-kernel")
-		nokernel="nokernel"
+	"--kernel")
+		kernel="$2"
+		shift
 		shift
 		continue
 		;;
@@ -73,11 +73,6 @@ while [ "$1" ]; do
 		break
 		;;
 	*)
-		if [ ! "$kernel" -a ! "$nokernel" ]; then
-			kernel=$1
-			shift
-			continue
-		fi
 		if [ ! "$rootfs" ]; then
 			rootfs=$1
 			shift
@@ -92,8 +87,8 @@ while [ "$1" ]; do
 	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
 
@@ -103,7 +98,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"
@@ -113,4 +112,3 @@ err="$?"
 rm "$ubinizecfg"
 
 exit $err
-