diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-04 12:02:59 -0700 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-04-10 10:55:22 +0200 |
| commit | a45c7dfb942b6c198d5cd283f8dcee145241a017 (patch) | |
| tree | 4dfe481918e77ed348a22a4ad3055237a109b4a6 /scripts | |
| parent | 0f40d9d3c5fb40da75af343f27775ca8a15e3806 (diff) | |
| download | linux-3.10-a45c7dfb942b6c198d5cd283f8dcee145241a017.tar.gz linux-3.10-a45c7dfb942b6c198d5cd283f8dcee145241a017.tar.bz2 linux-3.10-a45c7dfb942b6c198d5cd283f8dcee145241a017.zip | |
merge_config.sh: Avoid creating unnessary source softlinks
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: Bruce Ashfield <bruce.ashfield@windriver.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Reported-and-tested-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
| -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 05274fccb88..81b0c61bb9e 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) |