From: Sergiu Moga <sergiu.moga@protonmail.com>
Date: Sat, 20 May 2023 19:46:49 +0000 (+0300)
Subject: support/scripts/mkukimg: Add explicit `-o` option for output file
X-Git-Tag: RELEASE-0.14.0~63
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=602552c0f709bec3ff68cc6ca1bad5162efcde35;p=unikraft%2Funikraft.git

support/scripts/mkukimg: Add explicit `-o` option for output file

Resolve output file ambiguity by explicitly asking for it through
one of the command-line options, `-o`.

Signed-off-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #910
---

diff --git a/support/scripts/mkukimg b/support/scripts/mkukimg
index 583c9223a..9f70598d1 100755
--- a/support/scripts/mkukimg
+++ b/support/scripts/mkukimg
@@ -3,7 +3,7 @@
 # help menu
 usage()
 {
-	echo "Usage: $0 [options] [output file]"
+	echo "Usage: $0 [options]"
 	echo "Creates bootable images from Unikraft kernel images."
 	echo ""
 	echo "  -h                         Display help and exit"
@@ -14,13 +14,14 @@ usage()
 	echo "  -b                         Bootloader: grub (GRUB), ukefi (Unikraft EFI stub)"
 	echo "  -a                         Architecture: X64 (x86_64), AA64 (Aarch64)"
 	echo "  -d                         Path to Devicetree Blob (optional, for ukefi only!)"
+	echo "  -o                         Path to output file"
 	exit 1
 }
 
 # default options
 OPTFORMAT="iso"
 OPTCMDLINE=""
-OPTOUTPUT=${1}
+OPTOUTPUT=
 OPTARCH=
 OPTDTB=
 
@@ -105,7 +106,7 @@ mkukefiiso()
 }
 
 # process options
-while getopts "hk:c:i:f:a:b:d" OPT; do
+while getopts "hk:c:i:f:a:b:d:o:" OPT; do
 	case "${OPT}" in
 		h)
 			usage
@@ -131,6 +132,9 @@ while getopts "hk:c:i:f:a:b:d" OPT; do
 		d)
 			OPTDTB="${OPTARG}"
 			;;
+		o)
+			OPTOUTPUT="${OPTARG}"
+			;;
 		*)
 			usage
 			;;