aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/ubinize-image.sh
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-06-27 12:58:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-06-27 12:58:08 +0000
commit5f417387b8a2efca374b29501852200cd2e2297e (patch)
tree58ea2d1d709b1fa9a9f56b859a05713714e2326a /scripts/ubinize-image.sh
parent5b32f12d226034077dc63b44060481329be2d354 (diff)
downloadmaster-187ad058-5f417387b8a2efca374b29501852200cd2e2297e.tar.gz
master-187ad058-5f417387b8a2efca374b29501852200cd2e2297e.tar.bz2
master-187ad058-5f417387b8a2efca374b29501852200cd2e2297e.zip
make UbinizeImage work nicely without a kernel volume
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41359 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/ubinize-image.sh')
-rwxr-xr-xscripts/ubinize-image.sh14
1 files changed, 4 insertions, 10 deletions
diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 6ffedc5f32..1b782a6cdc 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,8 @@ while [ "$1" ]; do
shift
continue
;;
- "--no-kernel")
- nokernel="nokernel"
+ "--kernel")
+ kernel="$2"
shift
continue
;;
@@ -73,11 +72,6 @@ while [ "$1" ]; do
break
;;
*)
- if [ ! "$kernel" -a ! "$nokernel" ]; then
- kernel=$1
- shift
- continue
- fi
if [ ! "$rootfs" ]; then
rootfs=$1
shift
@@ -92,8 +86,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