[Buildroot] [git commit] genimage.sh: fix calling from BR2_ROOTFS_POST_IMAGE_SCRIPT
Peter Korsgaard
peter at korsgaard.com
Thu Apr 27 20:55:52 UTC 2017
commit: https://git.buildroot.net/buildroot/commit/?id=e73cf8a228a15ae11530cd589b11930cf4f4478d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
When called from BR2_ROOTFS_POST_IMAGE_SCRIPT, this script
ends up with following error:
Error: Missing argument
This is because, an extra positional argument is also passed
along with BR2_ROOTFS_POST_SCRIPT_ARGS. genimage.sh didn't
have support to parse positional and optional arguments
together.
Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.V at gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Tested-by: Rahul Bedarkar <rahulbedarkar89 at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
support/scripts/genimage.sh | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh
index 0ed0e8b..6c8d9e5 100755
--- a/support/scripts/genimage.sh
+++ b/support/scripts/genimage.sh
@@ -5,13 +5,22 @@ die() {
exit 1
}
+# Parse arguments and put into argument list of the script
+opts="$(getopt -n "${0##*/}" -o c: -- "$@")" || exit $?
+eval set -- "$opts"
+
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-while getopts c: OPT ; do
- case "${OPT}" in
- c) GENIMAGE_CFG="${OPTARG}";;
- :) die "option '${OPTARG}' expects a mandatory argument\n";;
- \?) die "unknown option '${OPTARG}'\n";;
+while true ; do
+ case "$1" in
+ -c)
+ GENIMAGE_CFG="${2}";
+ shift 2 ;;
+ --) # Discard all non-option parameters
+ shift 1;
+ break ;;
+ *)
+ die "unknown option '${1}'" ;;
esac
done
More information about the buildroot
mailing list