john stultz 4b5f72145e kconfig: add merge_config.sh script ... After noticing almost every distro has their own method of managing config fragments, I went looking at some best practices, and wanted to try to consolidate some of the different approaches so this fairly simple infrastructure can be shared (and new distros/build systems don't have to implement yet another config fragment merge script). This script is most influenced by the Windriver tools used in the Yocto Project, reusing some portions found there. This script merges multiple config fragments, warning on any overridden values. It then sets any unspecified values to their default, then finally checks to make sure no specified value was dropped due to unsatisfied dependencies. I'm sure this implementation won't work for everyone, and I expect it will need to evolve to adapt for various use cases. But I think its a reasonable starting point. Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Greg Thelen <gthelen@google.com> Cc: Reinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de> Cc: Dmitry Fink <Dmitry.Fink@palm.com> Cc: Darren Hart <dvhart@linux.intel.com> Cc: Eric B Munson <ebmunson@us.ibm.com> Cc: Bruce Ashfield <Bruce.Ashfield@windriver.com> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Michal Marek <mmarek@suse.cz>		2012-01-14 21:44:28 +01:00
..
basic	kbuild: move scripts/basic/docproc.c to scripts/docproc.c	2011-05-02 22:48:03 +02:00
coccinelle	scripts/coccinelle: update for compatability with Coccinelle 0.2.4	2010-12-03 12:27:01 +01:00
dtc	dtc: regen parser	2011-06-09 14:04:47 -04:00
genksyms	genksyms: Use same type in loop comparison	2011-07-25 14:55:17 +02:00
kconfig	kconfig: add merge_config.sh script	2012-01-14 21:44:28 +01:00
ksymoops
mod	modpost: Fix modpost's license checking V3	2011-07-24 22:06:05 +09:30
package	package: Makefile: fix perf target bug	2011-06-24 15:20:55 +02:00
rt-tester	Fix common misspellings	2011-03-31 11:26:23 -03:00
selinux	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
tracing	tracing, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
.gitignore	kbuild: move scripts/basic/docproc.c to scripts/docproc.c	2011-05-02 22:48:03 +02:00
bin2c.c
bloat-o-meter	bloat-o-meter: include read-only data section in report	2011-03-22 17:44:17 -07:00
bootgraph.pl	bootgraph.pl: relax timing information requirements	2011-06-13 00:04:57 +02:00
checkincludes.pl	checkincludes: fix perlcritic warnings	2010-03-07 21:19:57 +01:00
checkkconfigsymbols.sh	checkkconfigsymbols.sh: Kconfig symbols sometimes have lowercase letters	2010-06-03 10:39:39 +02:00
checkpatch.pl	checkpatch.pl: update $logFunctions	2011-07-25 20:57:16 -07:00
checkstack.pl	Haavard Skinnemoen has left Atmel	2011-05-18 23:24:50 +02:00
checksyscalls.sh	checksyscalls: Fix stand-alone usage	2010-12-20 15:40:33 +01:00
checkversion.pl	kbuild: don't warn about include/linux/version.h not including itself	2011-04-29 15:38:55 +02:00
cleanfile
cleanpatch
coccicheck	Coccinelle: Add contextual message	2010-10-28 00:32:23 +02:00
config	kbuild: add numeric --set-val option to scripts/config	2010-12-15 15:44:31 +01:00
conmakehash.c	Fix all -Wmissing-prototypes warnings in x86 defconfig	2009-09-23 07:39:28 -07:00
decodecode	scripts: decodecode: remove bashisms	2010-06-04 10:26:35 +02:00
depmod.sh	kbuild: Do not write to builddir in modules_install	2011-07-12 13:36:30 +02:00
diffconfig
docproc.c	docproc: cleanup brace placement	2011-06-16 20:40:03 +02:00
export_report.pl	export_report: use warn() to issue WARNING, so they go to stderr	2011-05-24 16:07:07 +02:00
extract-ikconfig	scripts/extract-ikconfig: add xz compression support	2011-02-10 15:23:03 +01:00
gcc-goto.sh	scripts/gcc-goto.sh: fix a typo ("suport")	2011-06-16 11:15:22 +02:00
gcc-version.sh
gcc-x86_32-has-stack-protector.sh
gcc-x86_64-has-stack-protector.sh
gen_initramfs_list.sh	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-05-24 13:31:37 -07:00
get_maintainer.pl	get_maintainers.pl: improve .mailmap parsing	2011-07-25 20:57:15 -07:00
gfp-translate	scripts: fix gfp-translate for recent changes to gfp.h	2010-11-25 06:50:49 +09:00
headerdep.pl	headerdep: perlcritic warning	2010-03-23 12:26:38 +01:00
headers_check.pl	headers_check: Fix warning text	2010-12-14 17:05:08 +01:00
headers_install.pl	headers_install: fix __packed in exported kernel headers	2011-06-24 16:56:05 +02:00
headers.sh	kbuild: introduce HDR_ARCH_LIST for headers_install_all	2010-12-14 22:16:19 +01:00
kallsyms.c	scripts/kallsyms.c: fix potential segfault	2011-05-12 17:23:40 +02:00
Kbuild.include	kbuild: add `baseprereq'	2011-06-09 14:04:38 -04:00
kernel-doc	Fix common misspellings	2011-03-31 11:26:23 -03:00
Lindent
Makefile	kbuild: move scripts/basic/docproc.c to scripts/docproc.c	2011-05-02 22:48:03 +02:00
Makefile.asm-generic	kbuild: silence Nothing to be done for 'all' message	2011-06-09 11:48:19 +02:00
Makefile.build	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-05-24 13:31:37 -07:00
Makefile.clean	kbuild: Really don't clean bounds.h and asm-offsets.h	2010-03-11 11:15:22 +01:00
Makefile.fwinst
Makefile.headersinst	kbuild: asm-generic support	2011-04-28 18:01:41 +02:00
Makefile.help	Add a target to use the Coccinelle checker	2010-06-12 00:00:29 +02:00
Makefile.host
Makefile.lib	kbuild: simplify the %_shipped rule	2011-06-09 14:04:39 -04:00
Makefile.modbuiltin	kbuild: Create output directory in Makefile.modbuiltin	2010-06-10 12:23:08 +02:00
Makefile.modinst
Makefile.modpost	Merge commit 'v3.0-rc1' into kbuild/kbuild	2011-06-07 15:37:51 +02:00
makelst
markup_oops.pl	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
mkcompile_h	Fix handling of backlash character in LINUX_COMPILE_BY name	2011-04-29 15:55:45 +02:00
mkmakefile	kbuild: silence generated makefile message	2011-07-20 17:08:08 +02:00
mksysmap
mkuboot.sh	mkuboot.sh: Fail if mkimage is missing	2011-01-07 14:31:01 +01:00
mkversion
module-common.lds	module: Sort exported symbols	2011-05-19 16:55:27 +09:30
namespace.pl	Revert "namespace: add source file location exceptions"	2010-10-28 00:59:56 +02:00
patch-kernel	eradicate bashisms in scripts/patch-kernel	2011-04-04 14:58:33 +02:00
pnmtologo.c
profile2linkerlist.pl	profile2linkerlist: fix perl warnings	2010-03-07 21:39:33 +01:00
recordmcount.c	ftrace/s390: mcount offset calculation	2011-05-16 15:05:06 -04:00
recordmcount.h	ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM	2011-05-25 19:56:33 -04:00
recordmcount.pl	ftrace/s390: mcount offset calculation	2011-05-16 15:05:06 -04:00
setlocalversion	setlocalversion: update mercurial tag parsing	2011-01-15 00:40:44 +01:00
show_delta	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
tags.sh	scripts/tags.sh: Add magic for trace-events for etags too	2011-05-25 19:56:31 -04:00
unifdef.c	unifdef: update to upstream version 2.5	2011-01-22 15:50:59 +01:00
ver_linux
xz_wrap.sh	decompressors: add XZ decompressor module	2011-01-13 08:03:24 -08:00