[PATCH 0/5] [GIT PULL] kconfig: Fixes to make localmodconfig

[PATCH 0/5] [GIT PULL] kconfig: Fixes to make localmodconfig

[Steven Rostedt]

Linus,

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
for-linus


Steven Rostedt (3):
      kconfig: Make localmodconfig handle environment variables
      kconfig: Fix streamline_config to read multi line deps in Kconfig files
      kconfig: Have streamline_config process menuconfigs too

hiromu (1):
      kconfig: Fix missing declaration of variable $dir in streamline_config.pl

hiromu yagura (1):
      kconfig: Fix variable name typo %prompts in streamline_config.pl

----
 scripts/kconfig/streamline_config.pl |   43 ++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 7 deletions(-)

[PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Steven Rostedt]

[-- Attachment #1: 0001-kconfig-Make-localmodconfig-handle-environment-varia.patch --]
[-- Type: text/plain, Size: 1408 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

The commit 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04
 kbuild: migrate all arch to the kconfig mainmenu upgrade

Broke make localmodconfig. The reason was that it added a
environment variable to the kconfig source, which the
streamline_config.pl could not handle.

This patch changes streamline_config.pl to handle kconfig sources
using environment variables in their names.

Cc: Arnaud Lacombe <lacombar@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index c70a27d..cc10bcf 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -137,7 +137,17 @@ sub read_kconfig {
     my $config;
     my @kconfigs;
 
-    open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig";
+    my $source = "$ksource/$kconfig";
+    my $last_source = "";
+
+    # Check for any environment variables used
+    while ($source =~ /\$(\w+)/ && $last_source ne $source) {
+	my $env = $1;
+	$last_source = $source;
+	$source =~ s/\$$env/$ENV{$env}/;
+    }
+
+    open(KIN, "$source") || die "Can't open $kconfig";
     while (<KIN>) {
 	chomp;
 
-- 
1.7.1

[PATCH 2/5] [PATCH 2/5] kconfig: Fix variable name typo %prompts in streamline_config.pl

[Steven Rostedt]

[-- Attachment #1: 0002-kconfig-Fix-variable-name-typo-prompts-in-streamline.patch --]
[-- Type: text/plain, Size: 1588 bytes --]

From: hiromu yagura <hiromu1996@gmail.com>

When I added "use strict;" to streamline_config.pl, I saw the following
warnings:

> Global symbol "%prompt" requires explicit package name at
scripts/kconfig/streamline_config.pl line 183.
> Global symbol "%prompt" requires explicit package name at
scripts/kconfig/streamline_config.pl line 368.

The declaration of %prompt was incorrect, and should have been %prompts.

Cc: Toralf Foerster <toralf.foerster@gmx.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Hiromu Yakura <hiromu1996@gmail.com>
LKML-Reference: <1281845597.11566.5.camel@camp10-laptop>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index cc10bcf..3c63aa9 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -188,7 +188,7 @@ sub read_kconfig {
 	# configs without prompts must be selected
 	} elsif ($state ne "NONE" && /^\s*tristate\s\S/) {
 	    # note if the config has a prompt
-	    $prompt{$config} = 1;
+	    $prompts{$config} = 1;
 
 	# Check for if statements
 	} elsif (/^if\s+(.*\S)\s*$/) {
@@ -373,7 +373,7 @@ while ($repeat) {
 	    parse_config_dep_select $depends{$config};
 	}
 
-	if (defined($prompt{$config}) || !defined($selects{$config})) {
+	if (defined($prompts{$config}) || !defined($selects{$config})) {
 	    next;
 	}
 
-- 
1.7.1

[PATCH 3/5] [PATCH 3/5] kconfig: Fix missing declaration of variable $dir in streamline_config.pl

[Steven Rostedt]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0003-kconfig-Fix-missing-declaration-of-variable-dir-in-s.patch --]
[-- Type: text/plain, Size: 1826 bytes --]

From: hiromu <hiromu1996@gmail.com>

On Fri, Aug 17, 2010 at 01:43PM +0800, Américo Wang wrote:
> Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
>
> BTW, I think we should add "use strict;" too.

Then I added "use strict;" to streamline_config.pl, I saw another
warning.

> Global symbol "$dir" requires explicit package name at
scripts/kconfig/streamline_config.pl line 286.
> Global symbol "$dir" requires explicit package name at
scripts/kconfig/streamline_config.pl line 287.
> Global symbol "$dir" requires explicit package name at
scripts/kconfig/streamline_config.pl line 288.

Then I added "my $dir;" to line 285.

Cc: Américo Wang <xiyou.wangcong@gmail.com>
Cc: Toralf Foerster <toralf.foerster@gmx.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Hiromu Yakura <hiromu1996@gmail.com>
LKML-Reference: <1282042158.7160.9.camel@hiromu-Macbook>

[ changed to just add my in front of $dir instead of new line ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 3c63aa9..883748c 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -42,6 +42,8 @@
 #    mv config_strip .config
 #    make oldconfig
 #
+use strict;
+
 my $config = ".config";
 
 my $uname = `uname -r`;
@@ -291,7 +293,7 @@ if (defined($lsmod_file)) {
     # see what modules are loaded on this system
     my $lsmod;
 
-    foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) {
+    foreach my $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) {
 	if ( -x "$dir/lsmod" ) {
 	    $lsmod = "$dir/lsmod";
 	    last;
-- 
1.7.1

[PATCH 4/5] [PATCH 4/5] kconfig: Fix streamline_config to read multi line deps in Kconfig files

[Steven Rostedt]

[-- Attachment #1: 0004-kconfig-Fix-streamline_config-to-read-multi-line-dep.patch --]
[-- Type: text/plain, Size: 1754 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

I noticed that some Kconfig files have multi line dependencies
that continue with a backslash. Those dependencies on the next
line will be missed by streamline_config.

For example:

config CS89x0
	tristate "CS89x0 support"
	depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
		|| ARCH_IXDP2X01 || MACH_MX31ADS)

The "|| ARCH_IXDP2X01 || MACH_MX31ADS)" will not be processed.

This patch adds code to handle this case.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 883748c..ebba407 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -125,7 +125,6 @@ my %selects;
 my %prompts;
 my %objects;
 my $var;
-my $cont = 0;
 my $iflevel = 0;
 my @ifdeps;
 
@@ -139,6 +138,9 @@ sub read_kconfig {
     my $config;
     my @kconfigs;
 
+    my $cont = 0;
+    my $line;
+
     my $source = "$ksource/$kconfig";
     my $last_source = "";
 
@@ -153,6 +155,19 @@ sub read_kconfig {
     while (<KIN>) {
 	chomp;
 
+	# Make sure that lines ending with \ continue
+	if ($cont) {
+	    $_ = $line . " " . $_;
+	}
+
+	if (s/\\$//) {
+	    $cont = 1;
+	    $line = $_;
+	    next;
+	}
+
+	$cont = 0;
+
 	# collect any Kconfig sources
 	if (/^source\s*"(.*)"/) {
 	    $kconfigs[$#kconfigs+1] = $1;
@@ -230,6 +245,8 @@ if ($kconfig) {
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
 
+    my $cont = 0;
+
     open(MIN,$makefile) || die "Can't open $makefile";
     while (<MIN>) {
 	my $objs;
-- 
1.7.1

[PATCH 5/5] [PATCH 5/5] kconfig: Have streamline_config process menuconfigs too

[Steven Rostedt]

[-- Attachment #1: 0005-kconfig-Have-streamline_config-process-menuconfigs-t.patch --]
[-- Type: text/plain, Size: 1062 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

Some menuconfigs in the Kconfig files have prompts and dependencies.
Currently, streamline_config misses these, and this can cause
streamline_config to keep modules enabled that should not be, and
even worse, not enable those that should.

This patch makes streamline_config process menuconfigs just like it
would process a config.

Reported-by: member graysky <graysky@archlinux.us>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/kconfig/streamline_config.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index ebba407..fd81fc3 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -174,9 +174,9 @@ sub read_kconfig {
 	}
 
 	# configs found
-	if (/^\s*config\s+(\S+)\s*$/) {
+	if (/^\s*(menu)?config\s+(\S+)\s*$/) {
 	    $state = "NEW";
-	    $config = $1;
+	    $config = $2;
 
 	    for (my $i = 0; $i < $iflevel; $i++) {
 		if ($i) {
-- 
1.7.1

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Arnaud Lacombe]

Hi,

On Fri, Oct 29, 2010 at 1:43 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> The commit 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04
>  kbuild: migrate all arch to the kconfig mainmenu upgrade
>
> Broke make localmodconfig. The reason was that it added a
> environment variable to the kconfig source, which the
> streamline_config.pl could not handle.
>
Technically, it is _not_ an environment variable; it is a kconfig
symbol's name. In this particular case, both name collide and the
kconfig symbol happens to get its default value from the environment.
The real fixes, from my point of view, would be to have a perl binding
of the kconfig backend and get rid of read_kconfig(). That said, your
patch is broken if a symbol happen not to match an environment
variable (both in name and value).

Btw, two questions:
 - who has authority on kconfig ? Michal or you ? MAINTAINERS say
"Roman Zippel", but AFAIK, this is no longer valid.
 - what is the delay someone in CC: is given the time to answer a
patch ? I see that this one particularly is already in Linus' tree.

Thanks,
 - Arnaud

> This patch changes streamline_config.pl to handle kconfig sources
> using environment variables in their names.
>
> Cc: Arnaud Lacombe <lacombar@gmail.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: Michal Marek <mmarek@suse.cz>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> ---
>  scripts/kconfig/streamline_config.pl |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
> index c70a27d..cc10bcf 100644
> --- a/scripts/kconfig/streamline_config.pl
> +++ b/scripts/kconfig/streamline_config.pl
> @@ -137,7 +137,17 @@ sub read_kconfig {
>     my $config;
>     my @kconfigs;
>
> -    open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig";
> +    my $source = "$ksource/$kconfig";
> +    my $last_source = "";
> +
> +    # Check for any environment variables used
> +    while ($source =~ /\$(\w+)/ && $last_source ne $source) {
> +       my $env = $1;
> +       $last_source = $source;
> +       $source =~ s/\$$env/$ENV{$env}/;
> +    }
> +
> +    open(KIN, "$source") || die "Can't open $kconfig";
>     while (<KIN>) {
>        chomp;
>
> --
> 1.7.1
>
>
>

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Steven Rostedt]

On Fri, 2010-10-29 at 20:26 -0400, Arnaud Lacombe wrote:
> Hi,

> Technically, it is _not_ an environment variable; it is a kconfig
> symbol's name. In this particular case, both name collide and the
> kconfig symbol happens to get its default value from the environment.
> The real fixes, from my point of view, would be to have a perl binding
> of the kconfig backend and get rid of read_kconfig(). That said, your
> patch is broken if a symbol happen not to match an environment
> variable (both in name and value).

That sounds like a proper fix. Unfortunately, I don't have the time to
work on this now, and although this fix works by coincidence, it
never-the-less works, as suppose to just having localmodconfig crash.

But you are right. After KS and Plumbers, I'll work on doing something
like that. That can probably solve some of the other issues I'm having
(still keeping too many modules enabled).

> 
> Btw, two questions:
>  - who has authority on kconfig ? Michal or you ? MAINTAINERS say
> "Roman Zippel", but AFAIK, this is no longer valid.

Michal is in charge of the build system. I just wrote
streamline_config.pl, and have been maintaining it on my own. If I ever
need to touch anything outside of that script, I always ask for Michal's
Acked-by.

>  - what is the delay someone in CC: is given the time to answer a
> patch ? I see that this one particularly is already in Linus' tree.

Well, again, I consider myself the maintainer of streamline_config.pl,
and as long as my changes don't affect anything else, I don't ask for
forgiveness ;-)

I probably should rename my subject (and my git tree) to
s/kconfig/localmodconfig/. But then again, having the kconfig: name gets
the attention of people like yourself to tell me what you told me.

-- Steve

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Arnaud Lacombe]

Hi,

On Fri, Oct 29, 2010 at 9:27 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> On Fri, 2010-10-29 at 20:26 -0400, Arnaud Lacombe wrote:
>> Hi,
>
>> Technically, it is _not_ an environment variable; it is a kconfig
>> symbol's name. In this particular case, both name collide and the
>> kconfig symbol happens to get its default value from the environment.
>> The real fixes, from my point of view, would be to have a perl binding
>> of the kconfig backend and get rid of read_kconfig(). That said, your
>> patch is broken if a symbol happen not to match an environment
>> variable (both in name and value).
>
> That sounds like a proper fix. Unfortunately, I don't have the time to
> work on this now, and although this fix works by coincidence, it
> never-the-less works, as suppose to just having localmodconfig crash.
>
yes, sure.

> But you are right. After KS and Plumbers, I'll work on doing something
> like that. That can probably solve some of the other issues I'm having
> (still keeping too many modules enabled).
>
I have some work in progress in this area: cleanup, better split
between the kconfig backend and frontend, and eventually a perl
binding. That would all be an interesting goal for .38 :-)

Currently I got the parser working within perl, but I'm not really
really sure of what I can currently do with it and how the whole thing
interface to one another :)

 - Arnaud

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Steven Rostedt]

On Sun, 2010-10-31 at 18:05 -0400, Arnaud Lacombe wrote:
> Hi,

> > But you are right. After KS and Plumbers, I'll work on doing something
> > like that. That can probably solve some of the other issues I'm having
> > (still keeping too many modules enabled).
> >
> I have some work in progress in this area: cleanup, better split
> between the kconfig backend and frontend, and eventually a perl
> binding. That would all be an interesting goal for .38 :-)
> 
> Currently I got the parser working within perl, but I'm not really
> really sure of what I can currently do with it and how the whole thing
> interface to one another :)

Let me know what you got, I would really like localmodconfig to have
this back end. It should really help get a minimal config as well.

-- Steve

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Michal Marek]

On 9.11.2010 01:49, Steven Rostedt wrote:
> On Sun, 2010-10-31 at 18:05 -0400, Arnaud Lacombe wrote:
>> Hi,
> 
>>> But you are right. After KS and Plumbers, I'll work on doing something
>>> like that. That can probably solve some of the other issues I'm having
>>> (still keeping too many modules enabled).
>>>
>> I have some work in progress in this area: cleanup, better split
>> between the kconfig backend and frontend, and eventually a perl
>> binding. That would all be an interesting goal for .38 :-)
>>
>> Currently I got the parser working within perl, but I'm not really
>> really sure of what I can currently do with it and how the whole thing
>> interface to one another :)
> 
> Let me know what you got, I would really like localmodconfig to have
> this back end. It should really help get a minimal config as well.

What information does localmodconfig need? A list of config options and
their computed dependencies and a flag for each option if it has prompt,
anything else? So a scripts/kconfig/conf --dump-kconfig that would
produce such flat list should suffice, without the complexity of having
to build a perl binding first (and would be usable from bash/awk/python
scripts as well). What do you think?

Michal

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Arnaud Lacombe]

Hi,

On Thu, Nov 25, 2010 at 10:45 AM, Michal Marek <mmarek@suse.cz> wrote:
> What information does localmodconfig need? A list of config options and
> their computed dependencies and a flag for each option if it has prompt,
> anything else? So a scripts/kconfig/conf --dump-kconfig that would
> produce such flat list should suffice, without the complexity of having
> to build a perl binding first (and would be usable from bash/awk/python
> scripts as well). What do you think?
>
Just as a FYI, the output of zconfdump() does not respect the kconfig
syntax. I've got some patches to fix that, but I've not been able to
touch them since a few weeks now.

 - Arnaud

Re: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle environment variables

[Michal Marek]

On 25.11.2010 17:21, Arnaud Lacombe wrote:
> Hi,
> 
> On Thu, Nov 25, 2010 at 10:45 AM, Michal Marek <mmarek@suse.cz> wrote:
>> What information does localmodconfig need? A list of config options and
>> their computed dependencies and a flag for each option if it has prompt,
>> anything else? So a scripts/kconfig/conf --dump-kconfig that would
>> produce such flat list should suffice, without the complexity of having
>> to build a perl binding first (and would be usable from bash/awk/python
>> scripts as well). What do you think?
>>
> Just as a FYI, the output of zconfdump() does not respect the kconfig
> syntax. I've got some patches to fix that, but I've not been able to
> touch them since a few weeks now.

I'm not saying zconfdump() has to be used or that it has to follow the
kconfig syntax (*), just that a pipe interface between the C kconfig and
a Perl script might be easier to implement and use :-).

(*) Although using a subset of the kconfig syntax would be a good idea
definitely.

Michal