* [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash [not found] <1321567131.25715.32.camel@work-vm> @ 2011-11-21 19:42 ` Darren Hart 2011-11-21 19:42 ` [PATCH 2/2] merge_config.sh: whitespace cleanup Darren Hart 2011-11-21 20:05 ` [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash John Stultz 0 siblings, 2 replies; 4+ messages in thread From: Darren Hart @ 2011-11-21 19:42 UTC (permalink / raw) To: Linux Kernel Mailing List Cc: John Stultz, Andrew Morton, Sam Ravnborg, gthelen, Dmitry Fink, Eric B Munson, Bruce Ashfield, Michal Marek, linux-kbuild, Richard Tartler, Darren Hart The SIGHUP SIGINT and SIGTERM names caused failures when running merge_config.sh with the dash shell. Dropping the "SIG" component makes the script work in both bash and dash. Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- scripts/kconfig/merge_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 890276b..b91015d 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -24,7 +24,7 @@ clean_up() { rm -f $TMP_FILE exit } -trap clean_up SIGHUP SIGINT SIGTERM +trap clean_up HUP INT TERM usage() { echo "Usage: $0 [OPTIONS] [CONFIG [...]]" -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] merge_config.sh: whitespace cleanup 2011-11-21 19:42 ` [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash Darren Hart @ 2011-11-21 19:42 ` Darren Hart 2011-11-21 20:14 ` John Stultz 2011-11-21 20:05 ` [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash John Stultz 1 sibling, 1 reply; 4+ messages in thread From: Darren Hart @ 2011-11-21 19:42 UTC (permalink / raw) To: Linux Kernel Mailing List Cc: John Stultz, Andrew Morton, Sam Ravnborg, gthelen, Dmitry Fink, Eric B Munson, Bruce Ashfield, Michal Marek, linux-kbuild, Richard Tartler, Darren Hart Fix whitespace usage in the clean_up routine. Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- scripts/kconfig/merge_config.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index b91015d..07bb886 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -21,8 +21,8 @@ # See the GNU General Public License for more details. clean_up() { - rm -f $TMP_FILE - exit + rm -f $TMP_FILE + exit } trap clean_up HUP INT TERM -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] merge_config.sh: whitespace cleanup 2011-11-21 19:42 ` [PATCH 2/2] merge_config.sh: whitespace cleanup Darren Hart @ 2011-11-21 20:14 ` John Stultz 0 siblings, 0 replies; 4+ messages in thread From: John Stultz @ 2011-11-21 20:14 UTC (permalink / raw) To: Darren Hart Cc: Linux Kernel Mailing List, Andrew Morton, Sam Ravnborg, gthelen, Dmitry Fink, Eric B Munson, Bruce Ashfield, Michal Marek, linux-kbuild, Richard Tartler On Mon, 2011-11-21 at 11:42 -0800, Darren Hart wrote: > Fix whitespace usage in the clean_up routine. > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> Acked-by: John Stultz <john.stultz@linaro.org> > --- > scripts/kconfig/merge_config.sh | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh > index b91015d..07bb886 100755 > --- a/scripts/kconfig/merge_config.sh > +++ b/scripts/kconfig/merge_config.sh > @@ -21,8 +21,8 @@ > # See the GNU General Public License for more details. > > clean_up() { > - rm -f $TMP_FILE > - exit > + rm -f $TMP_FILE > + exit > } > trap clean_up HUP INT TERM > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash 2011-11-21 19:42 ` [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash Darren Hart 2011-11-21 19:42 ` [PATCH 2/2] merge_config.sh: whitespace cleanup Darren Hart @ 2011-11-21 20:05 ` John Stultz 1 sibling, 0 replies; 4+ messages in thread From: John Stultz @ 2011-11-21 20:05 UTC (permalink / raw) To: Darren Hart Cc: Linux Kernel Mailing List, Andrew Morton, Sam Ravnborg, gthelen, Dmitry Fink, Eric B Munson, Bruce Ashfield, Michal Marek, linux-kbuild, Richard Tartler On Mon, 2011-11-21 at 11:42 -0800, Darren Hart wrote: > The SIGHUP SIGINT and SIGTERM names caused failures when running > merge_config.sh with the dash shell. Dropping the "SIG" component > makes the script work in both bash and dash. > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> Acked-by: John Stultz <john.stultz@linaro.org> > --- > scripts/kconfig/merge_config.sh | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh > index 890276b..b91015d 100755 > --- a/scripts/kconfig/merge_config.sh > +++ b/scripts/kconfig/merge_config.sh > @@ -24,7 +24,7 @@ clean_up() { > rm -f $TMP_FILE > exit > } > -trap clean_up SIGHUP SIGINT SIGTERM > +trap clean_up HUP INT TERM > > usage() { > echo "Usage: $0 [OPTIONS] [CONFIG [...]]" ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-21 20:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1321567131.25715.32.camel@work-vm>
2011-11-21 19:42 ` [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash Darren Hart
2011-11-21 19:42 ` [PATCH 2/2] merge_config.sh: whitespace cleanup Darren Hart
2011-11-21 20:14 ` John Stultz
2011-11-21 20:05 ` [PATCH 1/2] merge_config.sh: use signal names compatible with dash and bash John Stultz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox