merge_config.sh: Avoid creating unnessary source softlinks (a45c7dfb) · Commits · e / devices / android_kernel_sony_msm8998

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 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>

scripts/kconfig/merge_config.sh

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then
	exit		exit
	fi		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:		# Use the merged file as the starting point for:
	# alldefconfig: Fills in any missing symbols with Kconfig default		# alldefconfig: Fills in any missing symbols with Kconfig default
	# allnoconfig: Fills in any missing symbols with # CONFIG_* is not set		# 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)		# Check all specified config values took (might have missed-dependency issues)