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
..
basic	treewide: Fix typo in various drivers	2013-01-09 11:43:32 +01:00
coccinelle	Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2013-02-27 12:27:18 -08:00
dtc
genksyms	genksyms: fix metag symbol prefix on crc symbols	2013-03-02 20:11:13 +00:00
kconfig	merge_config.sh: Avoid creating unnessary source softlinks	2013-04-10 10:55:22 +02:00
ksymoops
mod	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2013-02-27 12:25:47 -08:00
package	kbuild: clear KBUILD_SRC when calling 'make' in RPM spec	2013-02-22 10:57:32 +01:00
rt-tester
selinux
tracing
.gitignore
asn1_compiler.c
bin2c.c
bloat-o-meter
bootgraph.pl
checkincludes.pl
checkkconfigsymbols.sh
checkpatch.pl	checkpatch: improve CamelCase test for Page	2013-02-27 19:10:08 -08:00
checkstack.pl	scripts/checkstack.pl: Add metag support	2013-03-02 20:09:55 +00:00
checksyscalls.sh
checkversion.pl
cleanfile
cleanpatch
coccicheck	coccicheck: Allow to show the executed command line	2013-02-22 14:25:44 +01:00
config	scripts/config: Fix wrong "shift" for --keep-case	2012-12-14 14:16:10 +01:00
conmakehash.c
decodecode
depmod.sh	depmod: pass -P $CONFIG_SYMBOL_PREFIX	2013-02-22 11:52:31 +01:00
diffconfig
docproc.c
export_report.pl
extract-ikconfig
extract-vmlinux
gcc-goto.sh
gcc-version.sh
gcc-x86_32-has-stack-protector.sh
gcc-x86_64-has-stack-protector.sh
gen_initramfs_list.sh
get_maintainer.pl	get_maintainer: allow keywords to match filenames	2013-02-27 19:10:09 -08:00
gfp-translate
headerdep.pl
headers_check.pl
headers_install.pl	UAPI: Strip _UAPI prefix on header install no matter the whitespace	2013-01-02 17:36:10 -08:00
headers.sh
kallsyms.c
Kbuild.include
kernel-doc	scripts/kernel-doc: handle struct member __aligned without numbers	2013-02-27 19:10:09 -08:00
Lindent
link-vmlinux.sh	kbuild: Fix reading of .config in link-vmlinux.sh	2013-02-25 16:14:48 +01:00
Makefile
Makefile.asm-generic
Makefile.build
Makefile.clean
Makefile.fwinst
Makefile.headersinst	kbuild: Fix destination-y for installed headers	2013-02-22 11:48:15 +01:00
Makefile.help
Makefile.host
Makefile.lib	kbuild: limit dtc+cpp include path	2013-02-13 10:12:10 +00:00
Makefile.modbuiltin
Makefile.modinst
Makefile.modpost	mod/file2alias: make modalias generation safe for cross compiling	2013-01-24 22:48:04 +01:00
Makefile.modsign	MODSIGN: Add modules_sign make target	2012-12-14 13:05:28 +10:30
makelst
markup_oops.pl
mkcompile_h
mkmakefile
mksysmap
mkuboot.sh
mkversion
module-common.lds
namespace.pl
patch-kernel
pnmtologo.c
profile2linkerlist.pl
recordmcount.c	metag: ftrace support	2013-03-02 20:09:55 +00:00
recordmcount.h
recordmcount.pl
setlocalversion	kbuild: Unset language specific variables in setlocalversion script	2013-02-22 14:18:30 +01:00
show_delta
sign-file	MODSIGN: Add -s <signature> option to sign-file	2013-01-25 16:55:36 +10:30
sortextable.c
sortextable.h	scripts/sortextable: silence script output	2013-02-14 15:04:41 +01:00
tags.sh	Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2013-02-27 12:27:18 -08:00
unifdef.c
ver_linux
xz_wrap.sh