[PATCH 0/3] [GIT PULL] kconfig: minor updates to streamline_config.pl

[PATCH 0/3] [GIT PULL] kconfig: minor updates to streamline_config.pl

[Steven Rostedt]

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] [PATCH 1/3] kconfig: Make a variable local in streamline_config.pl

[Steven Rostedt]

[-- Attachment #1: 0001-kconfig-Make-a-variable-local-in-streamline_config.p.patch --]
[-- Type: text/plain, Size: 899 bytes --]

From: Toralf Foerster <toralf.foerster@gmx.de>

Proper perl requires that local variables should be declared with 'my',
otherwise this may produce errors.

Signed-off-by: Toralf Foerster <toralf.foerster@gmx.de>
LKML-Reference: <201005281025.00358.toralf.foerster@gmx.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index afbd54a..9726946 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -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;
 	}
-- 
1.7.0

[PATCH 2/3] [PATCH 2/3] kconfig: Fix typo in comment in streamline_config.pl

[Steven Rostedt]

[-- Attachment #1: 0002-kconfig-Fix-typo-in-comment-in-streamline_config.pl.patch --]
[-- Type: text/plain, Size: 854 bytes --]

From: Toralf Foerster <toralf.foerster@gmx.de>

Signed-off-by: Toralf Foerster <toralf.foerster@gmx.de>
LKML-Reference: <201005281025.52753.toralf.foerster@gmx.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 9726946..2f8bde8 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -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;
 
-- 
1.7.0

[PATCH 3/3] [PATCH 3/3] kconfig: Hide error output in find command in streamline_config.pl

[Steven Rostedt]

[-- Attachment #1: 0003-kconfig-Hide-error-output-in-find-command-in-streaml.patch --]
[-- Type: text/plain, Size: 1304 bytes --]

From: =?UTF-8?q?Toralf=20F=C3=B6rster?= <toralf.foerster@gmx.de>

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.

Signed-off-by: Toralf Foerster <toralf.foerster@gmx.de>
LKML-Reference: <201005262022.02928.toralf.foerster@gmx.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 2f8bde8..c70a27d 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -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>) {
-- 
1.7.0