kconfig: Updates to localmodconfig
cover kconfig: Updates to localmodconfig
I'm posting the following patches for review. I've added these to go into linux-next. They can be found in the git repo shown below:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git
for-linus-2
Steven Rostedt (4):
kconfig: Create include/generated for localmodconfig
kconfig: Check for if conditions in Kconfig for localmodconfig
kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl
kconfig: Add LSMOD=file to override the lsmod for localmodconfig
----
scripts/kconfig/Makefile | 15 +++++++- scripts/kconfig/streamline_config.pl | 59 ++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-)
PATCH 1/4 kconfig: Create include/generated for localmodconfig
From: Steven Rostedt <[email protected]>
If someone downloads a brand new kernel and runs localmodconfig or localyesconfig, the ending result will report:
*** Error during update of the kernel configuration.
This is because localmodconfig and localyesconfig must create the include/generated directory to place the autoconf.h file.
--- scripts/kconfig/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
scripts/kconfig/Makefile +2 -0
@@ -31,6 +31,7 @@ silentoldconfig: $(obj)/conf $< -s $(Kconfig) localmodconfig: $(obj)/streamline_config.pl $(obj)/conf + $(Q)mkdir -p include/generated $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \
@@ -45,6 +46,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)rm -f .tmp.config localyesconfig: $(obj)/streamline_config.pl $(obj)/conf + $(Q)mkdir -p include/generated $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)sed -i s/=m/=y/ .tmp.config $(Q)if [ -f .config ]; then \
Signature · 1 line
1.6.5
PATCH 2/4 kconfig: Check for if conditions in Kconfig for localmodconfig
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
The streamline_config.pl misses the if conditions for checking dependencies. For Kconfigs with the following construct:
if MEDIA_SUPPORT
config VIDEO_DEV
[...]
If VIDEO_DEV was enabled, the script will miss the fact that MEDIA_SUPPORT is also needed.
This patch changes streamline_config.pl to include if conditions into the dependencies of configs.
--- scripts/kconfig/streamline_config.pl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-)
scripts/kconfig/streamline_config.pl +26 -0
@@ -121,6 +121,8 @@ my %prompts; my %objects; my $var; my $cont = 0; +my $iflevel = 0; +my @ifdeps; # prevent recursion my %read_kconfigs;
@@ -146,6 +148,15 @@ sub read_kconfig { $state = "NEW"; $config = $1; + for (my $i = 0; $i < $iflevel; $i++) { + if ($i) { + $depends{$config} .= " " . $ifdeps[$i]; + } else { + $depends{$config} = $ifdeps[$i]; + } + $state = "DEP"; + } + # collect the depends for the config } elsif ($state eq "NEW" && /^\s*depends\s+on\s+(.*)$/) { $state = "DEP";
@@ -166,6 +177,21 @@ sub read_kconfig { # note if the config has a prompt $prompt{$config} = 1; + # Check for if statements + } elsif (/^if\s+(.*\S)\s*$/) { + my $deps = $1; + # remove beginning and ending non text + $deps =~ s/^[^a-zA-Z0-9_]*//; + $deps =~ s/[^a-zA-Z0-9_]*$//; + + my @deps = split /[^a-zA-Z0-9_]+/, $deps; + + $ifdeps[$iflevel++] = join ':', @deps; + + } elsif (/^endif/) { + + $iflevel-- if ($iflevel); + # stop on "help" } elsif (/^\s*help\s*$/) { $state = "NONE";
Signature · 1 line
1.6.5
PATCH 3/4 kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Distributions now have lsmod in /bin instead of /sbin. But to handle both cases, we look for it in /sbin /bin /usr/bin and /usr/sbin. If lsmod is not found in any of those paths, it defaults to use just lsmod and hopes that it lies in the path of the user.
--- scripts/kconfig/streamline_config.pl | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)
scripts/kconfig/streamline_config.pl +14 -1
@@ -264,7 +264,20 @@ foreach my $makefile (@makefiles) { my %modules; # see what modules are loaded on this system -open(LIN,"/sbin/lsmod|") || die "Cant lsmod"; +my $lsmod; + +foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) { + if ( -x "$dir/lsmod" ) { + $lsmod = "$dir/lsmod"; + last; + } +} +if (!defined($lsmod)) { + # try just the path + $lsmod = "lsmod"; +} + +open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod"; while (<LIN>) { next if (/^Module/); # Skip the first line. if (/^(\S+)/) {
Signature · 1 line
1.6.5
PATCH 4/4 kconfig: Add LSMOD=file to override the lsmod for localmodconfig
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Doing the following:
make LSMOD=file localmodconfig
Will make the streamline-config code use the given file instead of lsmod. If the file is an executable, it will execute it, otherwise it will read it as text.
make LSMOD=/my/local/path/lsmod localmodconfig
The above will execute the lsmod in /my/local/path instead of the lsmods that may be located elsewhere.
make LSMOD=embedded_board_lsmod localmodconfig
The above will read the "embedded_board_lsmod" as a text file. This is useful if you are doing a cross compile and need to run the config against modules that exist on an embedded device.
Note, if the LSMOD= file does is not a path, it will add the path to the object directory. That is, the above example will look for "embedded_board_lsmod" in the directory that the binary will be built in (the O=dir directory).
On branch config/linus
--- scripts/kconfig/Makefile | 13 +++++++++- scripts/kconfig/streamline_config.pl | 38 ++++++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 13 deletions(-)
scripts/kconfig/Makefile +11 -2
@@ -30,9 +30,18 @@ silentoldconfig: $(obj)/conf $(Q)mkdir -p include/generated $< -s $(Kconfig) +# if no path is given, then use src directory to find file +ifdef LSMOD +LSMOD_F = $(shell if [ `basename $(LSMOD)` == $(LSMOD) ]; then \ + echo $(objtree)/$(LSMOD); \ + else \ + echo $(LSMOD); \ + fi) +endif + localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated - $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config + $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \ (mv -f .config .config.old.1; \
@@ -47,7 +56,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf localyesconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated - $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config + $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config $(Q)sed -i s/=m/=y/ .tmp.config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \
scripts/kconfig/streamline_config.pl +27 -11
@@ -113,6 +113,7 @@ find_config; # Get the build source and top level Kconfig file (passed in) my $ksource = $ARGV[0]; my $kconfig = $ARGV[1]; +my $lsmod_file = $ARGV[2]; my @makefiles = `find $ksource -name Makefile`; my %depends;
@@ -263,21 +264,36 @@ foreach my $makefile (@makefiles) { my %modules; -# see what modules are loaded on this system -my $lsmod; - -foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) { - if ( -x "$dir/lsmod" ) { - $lsmod = "$dir/lsmod"; - last; +if (defined($lsmod_file)) { + if ( ! -f $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"); } +} else { + + # see what modules are loaded on this system + my $lsmod; + + foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) { + if ( -x "$dir/lsmod" ) { + $lsmod = "$dir/lsmod"; + last; + } } -if (!defined($lsmod)) { - # try just the path - $lsmod = "lsmod"; + if (!defined($lsmod)) { + # try just the path + $lsmod = "lsmod"; + } + + open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod"; } -open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod"; while (<LIN>) { next if (/^Module/); # Skip the first line. if (/^(\S+)/) {
Signature · 1 line
1.6.5
Re: [PATCH 4/4] kconfig: Add LSMOD=file to override the lsmod for localmodconfig
scripts/kconfig/Makefile silentoldconfig: $(obj)/conf · line 40
Quoted 8 lines · Steven Rostedt
scripts/kconfig/Makefile +8
-0+# if no path is given, then use src directory to find file +ifdef LSMOD +LSMOD_F = $(shell if [ `basename $(LSMOD)` == $(LSMOD) ]; then \ + echo $(objtree)/$(LSMOD); \ + else \ + echo $(LSMOD); \ + fi) +endif
You can do this within make like:
ifdef LSMODLSMOD_F := $(LSMOD)
ifeq ($(findstring /,$(LSMOD)),)
LSMOD_F := $(objtree)/$(LSMOD)
endif
endif
Michal
Re: [PATCH 4/4] kconfig: Add LSMOD=file to override the lsmod for localmodconfig
Quoted 12 lines · Michal Marek
scripts/kconfig/Makefile silentoldconfig: $(obj)/conf · line 40
Quoted 8 lines · Steven Rostedt
scripts/kconfig/Makefile +8
-0+# if no path is given, then use src directory to find file +ifdef LSMOD +LSMOD_F = $(shell if [ `basename $(LSMOD)` == $(LSMOD) ]; then \ + echo $(objtree)/$(LSMOD); \ + else \ + echo $(LSMOD); \ + fi) +endifYou can do this within make like:
Quoted 6 lines
ifdef LSMOD
LSMOD_F:= $(LSMOD)
ifeq ($(findstring /,$(LSMOD)),)
LSMOD_F:= $(objtree)/$(LSMOD)
endif
endif
You can send me a patch and I'll apply it on top.
Thanks,
-- Steve
PATCH 1/1 kconfig: simplify LSMOD= handling
--- scripts/kconfig/Makefile | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
scripts/kconfig/Makefile +4 -5
@@ -32,11 +32,10 @@ silentoldconfig: $(obj)/conf # if no path is given, then use src directory to find file ifdef LSMOD -LSMOD_F = $(shell if [ `basename $(LSMOD)` == $(LSMOD) ]; then \ - echo $(objtree)/$(LSMOD); \ - else \ - echo $(LSMOD); \ - fi) +LSMOD_F := $(LSMOD) +ifeq ($(findstring /,$(LSMOD)),) + LSMOD_F := $(objtree)/$(LSMOD) +endif endif localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
Signature · 1 line
1.6.5.3
PATCH 1/1 kconfig: simplify LSMOD= handling
This has been merged into my for-next branch:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git
for-linus-2
Michal Marek (1):
kconfig: Simplify LSMOD= handling
----
scripts/kconfig/Makefile | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) --------------------------- commit 3cebbb81c7e75321e25cc586d07a25a3d98278fc Author: Michal Marek <[email protected]> Date: Wed Feb 3 17:20:14 2010 +0100
kconfig: Simplify LSMOD= handling
LKML-Reference: <[email protected]>
scripts/kconfig/Makefile +4 -5
@@ -32,11 +32,10 @@ silentoldconfig: $(obj)/conf # if no path is given, then use src directory to find file ifdef LSMOD -LSMOD_F = $(shell if [ `basename $(LSMOD)` == $(LSMOD) ]; then \ - echo $(objtree)/$(LSMOD); \ - else \ - echo $(LSMOD); \ - fi) +LSMOD_F := $(LSMOD) +ifeq ($(findstring /,$(LSMOD)),) + LSMOD_F := $(objtree)/$(LSMOD) +endif endif localmodconfig: $(obj)/streamline_config.pl $(obj)/conf