From: Darren Hart <dvhart@linux.intel.com>
Date: Fri, 16 Dec 2011 04:49:33 +0000 (+1100)
Subject: merge_config.sh: use signal names compatible with dash and bash
X-Git-Tag: next-20111221~2^2~223
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51136cebaa74476b7184aa64d8ebdbd2b704d4ab;p=karo-tx-linux.git

merge_config.sh: use signal names compatible with dash and bash

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>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 890276bd1e67..b91015df96aa 100644
--- 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 [...]]"