linux-toradex.git/scripts/kconfig/merge_config.sh, branch v3.7.8

merge_config.sh: Add option to display redundant configs

2012-03-30T13:14:47+00:00

Provide a -r option to display when fragments contain redundant
options. This is really useful when breaking apart a config into
fragments, as well as cleaning up older fragments.

Signed-off-by: John Stultz 
Acked-by: Darren Hart 
Acked-by: Bruce Ashfield 
Signed-off-by: Michal Marek

merge_config.sh: Set execute bit

2012-03-30T13:10:48+00:00

Somehow the merge_config.sh script didn't get its execute bit
set when it was merged. Fix this.

Signed-off-by: John Stultz 
Acked-by: Darren Hart 
Acked-by: Bruce Ashfield 
Signed-off-by: Michal Marek

merge_config.sh: Use the first file as the initial config

2012-03-24T22:25:40+00:00

Take the first config fragment and use it verbatim as the initial config
set.  This avoids running the verification loop for the first file, as
nothing has actually been merged at this point.  This significantly
increases performance for large config fragments.

Signed-off-by: Josh Boyer 
Acked-by: John Stultz 
Acked-by: Darren Hart 
Signed-off-by: Michal Marek

merge_config.sh: fix bug in final check

2012-01-14T20:44:29+00:00

Arnaud Lacombe pointed out the final checking that the requested configs
were included in the final .config was broken.

The example was that if you had a fragment that disabled
CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no
final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final
.config.

This bug was introduced by me in v3 of the original patch, and the
following patch reverts the invalid change.

Signed-off-by: John Stultz 
Reported-by: Arnaud Lacombe 
Cc: Darren Hart 
Cc: Michal Marek 
Cc: Arnaud Lacombe 
Signed-off-by: Andrew Morton 
Signed-off-by: Michal Marek

merge_config.sh: whitespace cleanup

2012-01-14T20:44:29+00:00

Fix whitespace usage in the clean_up routine.

Signed-off-by: Darren Hart 
Acked-by: John Stultz 
Cc: Michal Marek 
Signed-off-by: Andrew Morton 
Signed-off-by: Michal Marek

merge_config.sh: use signal names compatible with dash and bash

2012-01-14T20:44:29+00:00

The SIGHUP SIGINT and SIGTERM names caused failures when running
merge_config.sh with the dash shell.  Dropping the "SIG" component makes
the script work in both bash and dash.

Signed-off-by: Darren Hart 
Acked-by: John Stultz 
Cc: Michal Marek 
Signed-off-by: Andrew Morton 
Signed-off-by: Michal Marek

kconfig: add merge_config.sh script

2012-01-14T20:44:28+00:00

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 
Cc: Greg Thelen 
Cc: Reinhard Tartler 
Cc: Dmitry Fink 
Cc: Darren Hart 
Cc: Eric B Munson 
Cc: Bruce Ashfield 
Cc: Michal Marek 
Signed-off-by: John Stultz 
Signed-off-by: Andrew Morton 
Signed-off-by: Michal Marek