John Stultz
a45c7dfb94
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 409f117e2d
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>
2013-04-10 10:55:22 +02:00
..
lxdialog
menuconfig: optionally use pkg-config to detect ncurses libs
2013-03-07 00:20:51 +01:00
.gitignore
kconfig: remove lkc_defs.h from .gitignore and dontdiff
2012-07-13 15:08:25 +02:00
check.sh
kbuild: Fix gcc -x syntax
2012-10-03 09:03:24 +02:00
conf.c
kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig >conf.new
2013-02-19 13:48:36 +01:00
confdata.c
kconfig: allow long lines in config file
2012-07-13 22:51:30 +02:00
expr.c
kconfig: Fix malloc handling in conf tools
2012-11-20 12:12:47 +01:00
expr.h
menuconfig: Replace CIRCLEQ by list_head-style lists.
2012-10-25 15:06:00 +02:00
gconf.c
kconfig: get CONFIG_ prefix from the environment
2012-11-20 11:20:08 +01:00
gconf.glade
images.c
kxgettext.c
list.h
menuconfig: Replace CIRCLEQ by list_head-style lists.
2012-10-25 15:06:00 +02:00
lkc.h
kconfig: Fix malloc handling in conf tools
2012-11-20 12:12:47 +01:00
lkc_proto.h
menuconfig: Replace CIRCLEQ by list_head-style lists.
2012-10-25 15:06:00 +02:00
Makefile
kconfig: optionally use pkg-config to detect ncurses libs
2013-03-07 00:21:11 +01:00
mconf.c
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
2013-02-25 21:51:57 +01:00
menu.c
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
2013-02-25 21:51:57 +01:00
merge_config.sh
merge_config.sh: Avoid creating unnessary source softlinks
2013-04-10 10:55:22 +02:00
nconf.c
kconfig: nconf: rewrite labels of function keys line
2013-02-09 01:42:41 +01:00
nconf.gui.c
nconf: function keys line, change background color for better readability
2013-01-24 11:43:44 +01:00
nconf.h
scripts/kconfig/nconf: dynamically alloc dialog_input_result
2011-09-09 14:40:08 +02:00
POTFILES.in
qconf.cc
kconfig: fix a compiliation error when using make xconfig
2013-01-30 10:16:43 +01:00
qconf.h
xconfig: Abort close if configuration cannot be saved
2011-07-25 15:50:34 +02:00
streamline_config.pl
localmodconfig: Fix localyesconfig to set to 'y' not 'm'
2012-10-01 12:35:17 -04:00
symbol.c
kconfig: Fix malloc handling in conf tools
2012-11-20 12:12:47 +01:00
util.c
kconfig: Fix malloc handling in conf tools
2012-11-20 12:12:47 +01:00
zconf.gperf
zconf.hash.c_shipped
zconf.l
kconfig: Fix malloc handling in conf tools
2012-11-20 12:12:47 +01:00
zconf.lex.c_shipped
kconfig: Regenerate lexer
2012-11-20 12:12:57 +01:00
zconf.tab.c_shipped
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
2011-07-30 00:17:06 -07:00
zconf.y
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
2011-07-30 00:17:06 -07:00