* [PATCH 0/4] [GIT PULL] localmodconfig: clean ups and fixes
@ 2012-10-01 13:30 Steven Rostedt
2012-10-01 13:30 ` [PATCH 1/4] localmodconfig: Set default value for ksource in streamline_config.pl Steven Rostedt
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Steven Rostedt @ 2012-10-01 13:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, Bill Pemberton
[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]
Linus,
Bill Pemberton added some changes to make streamline-config.pl
work again as a stand-alone tool (outside of make localmodconfig).
Also, he added a couple of updates to make the code be more
"Perl proper".
*Note* I changed the gpg subkey that I use to sign with because the
old one is about to expire. You may need to refresh my key to
get the new subkeys.
Main key which you should have:
5ED9 A48F C54C 0A22 D1D0 804C EBC2 6CDB 5A56 DE73
Old subkey (expires tomorrow):
C66DAA00
New subkey:
71B30B4C
Please pull the latest localmodconfig-v3.7 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git
localmodconfig-v3.7
Head SHA1: 88050b21c2ca96aff36dc2cb1f29ee72d0a70fe6
Bill Pemberton (4):
localmodconfig: Set default value for ksource in streamline_config.pl
localmodconfig: Rework find_config in streamline_config.pl
localmodconfig: Use 3 parameter open in streamline_config.pl
localmodconfig: Use my variable for loop in streamline_config.pl
----
scripts/kconfig/streamline_config.pl | 48 ++++++++++++++++------------------
1 file changed, 22 insertions(+), 26 deletions(-)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] localmodconfig: Set default value for ksource in streamline_config.pl
2012-10-01 13:30 [PATCH 0/4] [GIT PULL] localmodconfig: clean ups and fixes Steven Rostedt
@ 2012-10-01 13:30 ` Steven Rostedt
2012-10-01 13:30 ` [PATCH 2/4] localmodconfig: Rework find_config " Steven Rostedt
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2012-10-01 13:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, Bill Pemberton
[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]
From: Bill Pemberton <wfp5p@virginia.edu>
Running streamline_config.pl as it's shown it in the comment header,
you will get a warning about $ksource being uninitialized. This is
because $ksource is set to ARGV[0], but the examples don't require any
arguments. Fix by setting ksource to . if no ARGV[0] is given.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
scripts/kconfig/streamline_config.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 2fbbbc1..e3687f9 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -135,7 +135,7 @@ GetOptions("localmodconfig" => \$localmodconfig,
"localyesconfig" => \$localyesconfig);
# Get the build source and top level Kconfig file (passed in)
-my $ksource = $ARGV[0];
+my $ksource = ($ARGV[0] ? $ARGV[0] : '.');
my $kconfig = $ARGV[1];
my $lsmod_file = $ENV{'LSMOD'};
--
1.7.10.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] localmodconfig: Rework find_config in streamline_config.pl
2012-10-01 13:30 [PATCH 0/4] [GIT PULL] localmodconfig: clean ups and fixes Steven Rostedt
2012-10-01 13:30 ` [PATCH 1/4] localmodconfig: Set default value for ksource in streamline_config.pl Steven Rostedt
@ 2012-10-01 13:30 ` Steven Rostedt
2012-10-01 13:30 ` [PATCH 3/4] localmodconfig: Use 3 parameter open " Steven Rostedt
2012-10-01 13:30 ` [PATCH 4/4] localmodconfig: Use my variable for loop " Steven Rostedt
3 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2012-10-01 13:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, Bill Pemberton
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
From: Bill Pemberton <wfp5p@virginia.edu>
Change find_config function to read_config. It now finds the config,
reads the config into an array, and returns the array. This makes it
a little cleaner and changes the open to use perl's 3 option open.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
scripts/kconfig/streamline_config.pl | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index e3687f9..62d64ce 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -100,7 +100,7 @@ my @searchconfigs = (
},
);
-sub find_config {
+sub read_config {
foreach my $conf (@searchconfigs) {
my $file = $conf->{"file"};
@@ -115,17 +115,15 @@ sub find_config {
print STDERR "using config: '$file'\n";
- open(CIN, "$exec $file |") || die "Failed to run $exec $file";
- return;
+ open(my $infile, '-|', "$exec $file") || die "Failed to run $exec $file";
+ my @x = <$infile>;
+ close $infile;
+ return @x;
}
die "No config file found";
}
-find_config;
-
-# Read in the entire config file into config_file
-my @config_file = <CIN>;
-close CIN;
+my @config_file = read_config;
# Parse options
my $localmodconfig = 0;
--
1.7.10.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] localmodconfig: Use 3 parameter open in streamline_config.pl
2012-10-01 13:30 [PATCH 0/4] [GIT PULL] localmodconfig: clean ups and fixes Steven Rostedt
2012-10-01 13:30 ` [PATCH 1/4] localmodconfig: Set default value for ksource in streamline_config.pl Steven Rostedt
2012-10-01 13:30 ` [PATCH 2/4] localmodconfig: Rework find_config " Steven Rostedt
@ 2012-10-01 13:30 ` Steven Rostedt
2012-10-01 13:30 ` [PATCH 4/4] localmodconfig: Use my variable for loop " Steven Rostedt
3 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2012-10-01 13:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, Bill Pemberton
[-- Attachment #1: Type: text/plain, Size: 2676 bytes --]
From: Bill Pemberton <wfp5p@virginia.edu>
Convert remaining open calls to use the perl's preferred 3 parameter
open.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
scripts/kconfig/streamline_config.pl | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 62d64ce..22b66ca 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -171,8 +171,8 @@ sub read_kconfig {
$source =~ s/\$$env/$ENV{$env}/;
}
- open(KIN, "$source") || die "Can't open $kconfig";
- while (<KIN>) {
+ open(my $kinfile, '<', $source) || die "Can't open $kconfig";
+ while (<$kinfile>) {
chomp;
# Make sure that lines ending with \ continue
@@ -249,7 +249,7 @@ sub read_kconfig {
$state = "NONE";
}
}
- close(KIN);
+ close($kinfile);
# read in any configs that were found.
foreach $kconfig (@kconfigs) {
@@ -293,8 +293,8 @@ foreach my $makefile (@makefiles) {
my $line = "";
my %make_vars;
- open(MIN,$makefile) || die "Can't open $makefile";
- while (<MIN>) {
+ open(my $infile, '<', $makefile) || die "Can't open $makefile";
+ while (<$infile>) {
# if this line ends with a backslash, continue
chomp;
if (/^(.*)\\$/) {
@@ -341,10 +341,11 @@ foreach my $makefile (@makefiles) {
}
}
}
- close(MIN);
+ close($infile);
}
my %modules;
+my $linfile;
if (defined($lsmod_file)) {
if ( ! -f $lsmod_file) {
@@ -354,13 +355,10 @@ if (defined($lsmod_file)) {
die "$lsmod_file not found";
}
}
- if ( -x $lsmod_file) {
- # the file is executable, run it
- open(LIN, "$lsmod_file|");
- } else {
- # Just read the contents
- open(LIN, "$lsmod_file");
- }
+
+ my $otype = ( -x $lsmod_file) ? '-|' : '<';
+ open($linfile, $otype, $lsmod_file);
+
} else {
# see what modules are loaded on this system
@@ -377,16 +375,16 @@ if (defined($lsmod_file)) {
$lsmod = "lsmod";
}
- open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod";
+ open($linfile, '-|', $lsmod) || die "Can not call lsmod with $lsmod";
}
-while (<LIN>) {
+while (<$linfile>) {
next if (/^Module/); # Skip the first line.
if (/^(\S+)/) {
$modules{$1} = 1;
}
}
-close (LIN);
+close ($linfile);
# add to the configs hash all configs that are needed to enable
# a loaded module. This is a direct obj-${CONFIG_FOO} += bar.o
--
1.7.10.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] localmodconfig: Use my variable for loop in streamline_config.pl
2012-10-01 13:30 [PATCH 0/4] [GIT PULL] localmodconfig: clean ups and fixes Steven Rostedt
` (2 preceding siblings ...)
2012-10-01 13:30 ` [PATCH 3/4] localmodconfig: Use 3 parameter open " Steven Rostedt
@ 2012-10-01 13:30 ` Steven Rostedt
3 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2012-10-01 13:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Linus Torvalds, Bill Pemberton
[-- Attachment #1: Type: text/plain, Size: 913 bytes --]
From: Bill Pemberton <wfp5p@virginia.edu>
perlcritic complains about $kconfig being reused in the foreach loop
at the end of read_kconfig. Change it to a my variable.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
scripts/kconfig/streamline_config.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 22b66ca..39b6314 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -252,7 +252,7 @@ sub read_kconfig {
close($kinfile);
# read in any configs that were found.
- foreach $kconfig (@kconfigs) {
+ foreach my $kconfig (@kconfigs) {
if (!defined($read_kconfigs{$kconfig})) {
$read_kconfigs{$kconfig} = 1;
read_kconfig($kconfig);
--
1.7.10.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-01 13:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-01 13:30 [PATCH 0/4] [GIT PULL] localmodconfig: clean ups and fixes Steven Rostedt
2012-10-01 13:30 ` [PATCH 1/4] localmodconfig: Set default value for ksource in streamline_config.pl Steven Rostedt
2012-10-01 13:30 ` [PATCH 2/4] localmodconfig: Rework find_config " Steven Rostedt
2012-10-01 13:30 ` [PATCH 3/4] localmodconfig: Use 3 parameter open " Steven Rostedt
2012-10-01 13:30 ` [PATCH 4/4] localmodconfig: Use my variable for loop " Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).