summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-04-30 12:15:10 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-08-18 21:58:54 -0400
commit744ffcbe867b81e9f467503c85bc5e4f9a586294 (patch)
tree724f067dc72301a7969ba6c89bfbfa724943a439 /scripts
parentea2c1894b66301bce565471d6914d49ce91ee015 (diff)
kconfig: enable CONFIG_IKCONFIG from streamline_config.pl
Ingo Molnar suggested that the streamline_config.pl should enable CONFIG_IKCONFIG to keep the current config in the kernel. Then we can use scripts/extract-ikconfig to find the current modules. This patch changes streamline_config.pl to check if CONFIG_IKCONFIG is not set, and if it is not, it enables it to be a module. [ Impact: make current config options easier to find ] Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/streamline_config.pl33
1 files changed, 23 insertions, 10 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index caac952212e..233464185a9 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -256,18 +256,31 @@ my %setconfigs;
# Finally, read the .config file and turn off any module enabled that
# we could not find a reason to keep enabled.
while(<CIN>) {
- if (/^(CONFIG.*)=(m|y)/) {
- if (defined($configs{$1})) {
- $setconfigs{$1} = $2;
- print;
- } elsif ($2 eq "m") {
- print "# $1 is not set\n";
- } else {
- print;
- }
+
+ if (/CONFIG_IKCONFIG/) {
+ if (/# CONFIG_IKCONFIG is not set/) {
+ # enable IKCONFIG at least as a module
+ print "CONFIG_IKCONFIG=m\n";
+ # don't ask about PROC
+ print "# CONFIG_IKCONFIG is not set\n";
+ } else {
+ print;
+ }
+ next;
+ }
+
+ if (/^(CONFIG.*)=(m|y)/) {
+ if (defined($configs{$1})) {
+ $setconfigs{$1} = $2;
+ print;
+ } elsif ($2 eq "m") {
+ print "# $1 is not set\n";
} else {
- print;
+ print;
}
+ } else {
+ print;
+ }
}
close(CIN);