2014-12-11 20:52:54

by Olof Johansson

Subject: [PATCH 1/2] merge_config.sh: Display usage if given too few arguments

Two or more arguments are always expected. Show usage and exit if
given less.

Signed-off-by: Olof Johansson <[email protected]>
---
scripts/kconfig/merge_config.sh | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 81b0c61..2ab91b9 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -77,6 +77,11 @@ while true; do
esac
done

+if [ "$#" -lt 2 ] ; then
+ usage
+ exit
+fi
+
INITFILE=$1
shift;

--
1.7.10.4

2014-12-11 20:58:58

by Olof Johansson

Subject: [PATCH 2/2] merge_config.sh: add -? for help

It's usual enough for help text that it makes sense to support it.

Signed-off-by: Olof Johansson <[email protected]>
---
scripts/kconfig/merge_config.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 2ab91b9..0c89537 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -28,11 +28,11 @@ trap clean_up HUP INT TERM

usage() {
echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
- echo " -h display this help text"
- echo " -m only merge the fragments, do not execute the make command"
- echo " -n use allnoconfig instead of alldefconfig"
- echo " -r list redundant entries when merging fragments"
- echo " -O dir to put generated output files"
+ echo " -h or -? display this help text"
+ echo " -m only merge the fragments, do not execute the make command"
+ echo " -n use allnoconfig instead of alldefconfig"
+ echo " -r list redundant entries when merging fragments"
+ echo " -O dir to put generated output files"
}

MAKE=true
@@ -52,7 +52,7 @@ while true; do
shift
continue
;;
- "-h")
+ "-h"|"-?")
usage
exit
;;
--
1.7.10.4

2014-12-24 04:51:40

by Masahiro Yamada

Subject: Re: [PATCH 2/2] merge_config.sh: add -? for help

Hi, Olof

Not that I care, but what does this patch improve?




On Thu, 11 Dec 2014 12:55:04 -0800
Olof Johansson <[email protected]> wrote:

> It's usual enough for help text that it makes sense to support it.
>
> Signed-off-by: Olof Johansson <[email protected]>
> ---
> scripts/kconfig/merge_config.sh | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> index 2ab91b9..0c89537 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -28,11 +28,11 @@ trap clean_up HUP INT TERM
>
> usage() {
> echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
> - echo " -h display this help text"
> - echo " -m only merge the fragments, do not execute the make command"
> - echo " -n use allnoconfig instead of alldefconfig"
> - echo " -r list redundant entries when merging fragments"
> - echo " -O dir to put generated output files"
> + echo " -h or -? display this help text"
> + echo " -m only merge the fragments, do not execute the make command"
> + echo " -n use allnoconfig instead of alldefconfig"
> + echo " -r list redundant entries when merging fragments"
> + echo " -O dir to put generated output files"
> }
>
> MAKE=true
> @@ -52,7 +52,7 @@ while true; do
> shift
> continue
> ;;
> - "-h")
> + "-h"|"-?")
> usage
> exit
> ;;
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2014-12-26 22:40:29

by Darren Hart

Subject: Re: [PATCH 2/2] merge_config.sh: add -? for help

No objection to the addition of -? if you find it useful.

Acked-by: Darren Hart <[email protected]>

--
Darren Hart
Intel Open Source Technology Center




On 12/11/14, 12:55 PM, "Olof Johansson" <[email protected]> wrote:

>It's usual enough for help text that it makes sense to support it.
>
>Signed-off-by: Olof Johansson <[email protected]>
>---
> scripts/kconfig/merge_config.sh | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/scripts/kconfig/merge_config.sh
>b/scripts/kconfig/merge_config.sh
>index 2ab91b9..0c89537 100755
>--- a/scripts/kconfig/merge_config.sh
>+++ b/scripts/kconfig/merge_config.sh
>@@ -28,11 +28,11 @@ trap clean_up HUP INT TERM
>
> usage() {
> echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
>- echo " -h display this help text"
>- echo " -m only merge the fragments, do not execute the make command"
>- echo " -n use allnoconfig instead of alldefconfig"
>- echo " -r list redundant entries when merging fragments"
>- echo " -O dir to put generated output files"
>+ echo " -h or -? display this help text"
>+ echo " -m only merge the fragments, do not execute the make
>command"
>+ echo " -n use allnoconfig instead of alldefconfig"
>+ echo " -r list redundant entries when merging fragments"
>+ echo " -O dir to put generated output files"
> }
>
> MAKE=true
>@@ -52,7 +52,7 @@ while true; do
> shift
> continue
> ;;
>- "-h")
>+ "-h"|"-?")
> usage
> exit
> ;;
>--
>1.7.10.4
>