kconfig: updates to streamline_config.pl
cover kconfig: updates to streamline_config.pl
Thanks to Alan Jenkins for suggesting these cleanups/fixes/enhancements.
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
branch: kconfig
Steven Rostedt (2):
kconfig: unset IKCONFIG_PROC and clean up nesting
kconfig: test for /boot/config-uname after /proc/config.gz in localconfig
----
scripts/kconfig/streamline_config.pl | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
PATCH 1/2 kconfig: unset IKCONFIG_PROC and clean up nesting
From: Steven Rostedt <[email protected]>
Due to cut and paste error IKCONFIG was both set and cleared. It was suppose to be IKCONFIG_PROC to be cleared.
Also cleaned up if nesting.
[ Impact: enable IKCONFIG ]
--- scripts/kconfig/streamline_config.pl | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
scripts/kconfig/streamline_config.pl +3 -6
@@ -323,7 +323,7 @@ while(<CIN>) { # enable IKCONFIG at least as a module print "CONFIG_IKCONFIG=m\n"; # don't ask about PROC - print "# CONFIG_IKCONFIG is not set\n"; + print "# CONFIG_IKCONFIG_PROC is not set\n"; } else { print; }
@@ -333,15 +333,12 @@ 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; + next; } - } else { - print; } + print; } close(CIN);
Signature · 3 lines
1.6.2.1 --
PATCH 2/2 kconfig: test for /boot/config-uname after /proc/config.gz in localconfig
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Many distros put their config in /boot/config-uname -r, add a check for that right after /proc/config.gz
[ Impact: use distro config as default to streamline_config.pl ]
--- scripts/kconfig/streamline_config.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
scripts/kconfig/streamline_config.pl +4 -0
@@ -54,6 +54,10 @@ my @searchconfigs = ( "exec" => "zcat", }, { + "file" => "/boot/config-$uname", + "exec" => "cat", + }, + { "file" => "/boot/vmlinuz-$uname", "exec" => "scripts/extract-ikconfig", "test" => "scripts/extract-ikconfig",
Signature · 3 lines
1.6.2.1 --
Quoted 1 line · Steven Rostedt
Thanks to Alan Jenkins for suggesting these cleanups/fixes/enhancements.
And thanks to you for pushing this script! It should be handy for speeding up bisection builds, without accidentally disabling a config that caused the regression.
Though I'm wary of it for _general_ usage, because of hotplug. I think it would be even more useful if there was some way to preserve all the currently selected USB drivers.
Alan
Quoted 10 lines · Alan Jenkins
Quoted 1 line · Steven Rostedt
Thanks to Alan Jenkins for suggesting these cleanups/fixes/enhancements.
And thanks to you for pushing this script! It should be handy for speeding up bisection builds, without accidentally disabling a config that caused the regression.
Though I'm wary of it for _general_ usage, because of hotplug. I think it would be even more useful if there was some way to preserve all the currently selected USB drivers.
While we're on feature requests...
- the same for things like netfilter etc..
- the ability to generate permutation configs, I've had the need to build test code that had like way to many CONFIG options:
GROUP_SCHED * {USER_SCHED, CGROUP_SCHED} * FAIR_GROUP_SCHED * RT_GROUP_SCHED
comes to mind. With a streamlined .config changing the configuration takes more time than actually building a bzImage.