diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-04 11:50:49 -0700 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-04-08 21:51:44 +0400 |
| commit | 147b85bed8bf93f67c069d00099d1fbc1d63097e (patch) | |
| tree | c20b9686128518d78461bb2e4f7e9c05280a5a4e | |
| parent | 5ce4daa4fcbf2084539ebbd6913785b1614f130a (diff) | |
merge_config.sh: Avoid creating unnessary source softlinkstracking-llct-v3.9-misc-fixes-llct-20130508.0tracking-llct-v3.9-misc-fixes-llct-20130506.0tracking-llct-v3.9-misc-fixes-llct-20130502.0tracking-llct-v3.9-misc-fixes-llct-20130417.0tracking-llct-v3.9-misc-fixes-llct-20130415.0tracking-llct-v3.9-misc-fixes-llct-20130411.0tracking-llct-v3.9-misc-fixes-llct-20130408.0
Viresh noticed when using merge_config.sh that a source softlink
was being created even when he didn't specify the -O option.
The problem arises due to the previous commit 409f117e2d6b
which added the -O option. Basically if -O is not specified,
we still pass '-O=.' to the make command, which then generates
a source softlink to ./
This patch adds an extra check so if there is no -O specified
to merge_config.sh, we don't pass one on to make.
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: Darren Hart <dvhart@linux.intel.com>
Reported-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rwxr-xr-x | scripts/kconfig/merge_config.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 05274fccb88e..81b0c61bb9e2 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then exit fi +# If we have an output dir, setup the O= argument, otherwise leave +# it blank, since O=. will create an unnecessary ./source softlink +OUTPUT_ARG="" +if [ "$OUTPUT" != "." ] ; then + OUTPUT_ARG="O=$OUTPUT" +fi + + # Use the merged file as the starting point for: # alldefconfig: Fills in any missing symbols with Kconfig default # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set -make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET +make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues) |