On 04/03/2013 10:01 AM, Viresh Kumar wrote:
On 3 April 2013 21:41, John Stultz <john.stu...@linaro.org> wrote:
On 04/02/2013 11:26 PM, Viresh Kumar wrote:
Hi John,
I have been struggling since some time "who creates source directory
in my kernel tree"?
And i thought to clean up the mess today and found running
merge_config.sh creates
it.. And it isn't cleaned up even by running make mrproper...
PS: I am not using O=../ option.
I'm not sure I'm following this at all. Could you explain in more detail
whats going on?
My bad...
So whenever i run merge_config.sh with or without O= option, a link called
"source" is created in kernel directory, which points to the kernel directory.
And git status complains about it every time as new directory.
eg:
lrwxrwxrwx 1 viresh arm 59 Apr 3 22:30 source ->
/home/arm/work/kernel/linaro/linux-linaro-big-LITTLE-MP.git/
Huh. I'm totally unfamiliar with this.
Looks like when adding support for the -O option, if its not used, we
end up passing -O=. to make, which generates the unnecessary source
softlink.
Does the attached patch fix it for you?
thanks
-john
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 05274fc..81b0c61 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)
_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev
