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.
Unified · Split
| @@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then · 119 unmodified lines | |||
| 120 | exit | 120 | exit |
| 121 | fi | 121 | fi |
| 122 | 122 | ||
| 123 | # If we have an output dir, setup the O= argument, otherwise leave | ||
| 124 | # it blank, since O=. will create an unnecessary ./source softlink | ||
| 125 | OUTPUT_ARG="" | ||
| 126 | if [ "$OUTPUT" != "." ] ; then | ||
| 127 | OUTPUT_ARG="O=$OUTPUT" | ||
| 128 | fi | ||
| 129 | |||
| 130 | |||
| 123 | # Use the merged file as the starting point for: | 131 | # Use the merged file as the starting point for: |
| 124 | # alldefconfig: Fills in any missing symbols with Kconfig default | 132 | # alldefconfig: Fills in any missing symbols with Kconfig default |
| 125 | # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set | 133 | # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set |
| 126 | make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET | 134 | make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET |
| 127 | 135 | ||
| 128 | 136 | ||
| 129 | # Check all specified config values took (might have missed-dependency issues) | 137 | # Check all specified config values took (might have missed-dependency issues) |