kconfig: minor updates to streamline_config.pl
Linus,
These are minor updates for the streamline_config.pl script.
Please pull the latest for-linus tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git
branch: for-linus
Toralf Foerster (3):
kconfig: Make a variable local in streamline_config.pl
kconfig: Fix typo in comment in streamline_config.pl
kconfig: Hide error output in find command in streamline_config.pl
----
scripts/kconfig/streamline_config.pl | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
PATCH 1/3 kconfig: Make a variable local in streamline_config.pl
From: Toralf Foerster <[email protected]>
Proper perl requires that local variables should be declared with 'my', otherwise this may produce errors.
LKML-Reference: <[email protected]>
--- scripts/kconfig/streamline_config.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/kconfig/streamline_config.pl +1 -1
@@ -307,7 +307,7 @@ close (LIN); my %configs; foreach my $module (keys(%modules)) { if (defined($objects{$module})) { - @arr = @{$objects{$module}}; + my @arr = @{$objects{$module}}; foreach my $conf (@arr) { $configs{$conf} = $module; }
Signature · 1 line
1.7.0
PATCH 2/3 kconfig: Fix typo in comment in streamline_config.pl
In reply to Steven RostedtFrom: Toralf Foerster <[email protected]>
LKML-Reference: <[email protected]>
--- scripts/kconfig/streamline_config.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/kconfig/streamline_config.pl +1 -1
@@ -242,7 +242,7 @@ foreach my $makefile (@makefiles) { foreach my $obj (split /\s+/,$objs) { $obj =~ s/-/_/g; if ($obj =~ /(.*)\.o$/) { - # Objects may bes enabled by more than one config. + # Objects may be enabled by more than one config. # Store configs in an array. my @arr;
Signature · 1 line
1.7.0
PATCH 3/3 kconfig: Hide error output in find command in streamline_config.pl
In reply to Steven RostedtFrom: =?UTF-8?q?Toralf=20F=C3=B6rster?= <[email protected]>
Finding the list of Makefiles in streamline-config should not report errors.
Also move the "chomp" to the @makefiles array instead of doing it in the for loop. This is more efficient, and does not make it any less readable by C programmers.
LKML-Reference: <[email protected]>
--- scripts/kconfig/streamline_config.pl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
scripts/kconfig/streamline_config.pl +3 -2
@@ -115,7 +115,9 @@ my $ksource = $ARGV[0]; my $kconfig = $ARGV[1]; my $lsmod_file = $ARGV[2]; -my @makefiles = `find $ksource -name Makefile`; +my @makefiles = `find $ksource -name Makefile 2>/dev/null`; +chomp @makefiles; + my %depends; my %selects; my %prompts;
@@ -215,7 +217,6 @@ if ($kconfig) { # Read all Makefiles to map the configs to the objects foreach my $makefile (@makefiles) { - chomp $makefile; open(MIN,$makefile) || die "Can't open $makefile"; while (<MIN>) {
Signature · 1 line
1.7.0