| Message ID | 1313472233-14094-1-git-send-email-lacombar@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 2011-08-16 at 01:23 -0400, Arnaud Lacombe wrote: > Cc: Steven Rostedt <rostedt@goodmis.org> > Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> > --- > scripts/kconfig/Makefile | 12 ++---------- > scripts/kconfig/streamline_config.pl | 8 ++++++-- > 2 files changed, 8 insertions(+), 12 deletions(-) Hi Arnaud, I like these versions better. Yeah, using the LSMOD environment is the better way to go. I'll do some tests on them and then push them up. Thanks! -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Tue, Aug 16, 2011 at 11:31 AM, Steven Rostedt <rostedt@goodmis.org> wrote: > On Tue, 2011-08-16 at 01:23 -0400, Arnaud Lacombe wrote: >> Cc: Steven Rostedt <rostedt@goodmis.org> >> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> >> --- >> scripts/kconfig/Makefile | 12 ++---------- >> scripts/kconfig/streamline_config.pl | 8 ++++++-- >> 2 files changed, 8 insertions(+), 12 deletions(-) > > Hi Arnaud, > > I like these versions better. Yeah, using the LSMOD environment is the > better way to go. > > I'll do some tests on them and then push them up. > If you ACK them, I think this would be better if they go through the kconfig tree. I have other patches pending touching `scripts/kconfig/Makefile' which might create conflicts. Thanks, - Arnaud > Thanks! > > -- Steve > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 2011-08-16 at 11:44 -0400, Arnaud Lacombe wrote: > Hi, > > On Tue, Aug 16, 2011 at 11:31 AM, Steven Rostedt <rostedt@goodmis.org> wrote: > > On Tue, 2011-08-16 at 01:23 -0400, Arnaud Lacombe wrote: > >> Cc: Steven Rostedt <rostedt@goodmis.org> > >> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> > >> --- > >> scripts/kconfig/Makefile | 12 ++---------- > >> scripts/kconfig/streamline_config.pl | 8 ++++++-- > >> 2 files changed, 8 insertions(+), 12 deletions(-) > > > > Hi Arnaud, > > > > I like these versions better. Yeah, using the LSMOD environment is the > > better way to go. > > > > I'll do some tests on them and then push them up. > > > If you ACK them, I think this would be better if they go through the > kconfig tree. I have other patches pending touching > `scripts/kconfig/Makefile' which might create conflicts. Fine with me. You can add my: Acked-by: Steven Rostedt <rostedt@goodmis.org> on all three patches. -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Michal, On Tue, Aug 16, 2011 at 4:16 PM, Steven Rostedt <rostedt@goodmis.org> wrote: > On Tue, 2011-08-16 at 11:44 -0400, Arnaud Lacombe wrote: >> Hi, >> >> On Tue, Aug 16, 2011 at 11:31 AM, Steven Rostedt <rostedt@goodmis.org> wrote: >> > On Tue, 2011-08-16 at 01:23 -0400, Arnaud Lacombe wrote: >> >> Cc: Steven Rostedt <rostedt@goodmis.org> >> >> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> >> >> --- >> >> scripts/kconfig/Makefile | 12 ++---------- >> >> scripts/kconfig/streamline_config.pl | 8 ++++++-- >> >> 2 files changed, 8 insertions(+), 12 deletions(-) >> > >> > Hi Arnaud, >> > >> > I like these versions better. Yeah, using the LSMOD environment is the >> > better way to go. >> > >> > I'll do some tests on them and then push them up. >> > >> If you ACK them, I think this would be better if they go through the >> kconfig tree. I have other patches pending touching >> `scripts/kconfig/Makefile' which might create conflicts. > > Fine with me. You can add my: > > Acked-by: Steven Rostedt <rostedt@goodmis.org> > > on all three patches. > If you want, you can directly pull the patches from the git repository at: git@github.com:lacombar/linux-2.6.git master/kconfig-localmodconfig Thanks - Arnaud -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 18.8.2011 01:48, Arnaud Lacombe wrote: >>> If you ACK them, I think this would be better if they go through the >>> kconfig tree. I have other patches pending touching >>> `scripts/kconfig/Makefile' which might create conflicts. >> >> Fine with me. You can add my: >> >> Acked-by: Steven Rostedt <rostedt@goodmis.org> >> >> on all three patches. >> > If you want, you can directly pull the patches from the git repository at: > > git@github.com:lacombar/linux-2.6.git master/kconfig-localmodconfig Pulled, thanks. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 82d2eb2..bd41ab2 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -33,17 +33,9 @@ silentoldconfig: $(obj)/conf $(Q)mkdir -p include/generated $< --$@ $(Kconfig) -# if no path is given, then use src directory to find file -ifdef LSMOD -LSMOD_F := $(LSMOD) -ifeq ($(findstring /,$(LSMOD)),) - LSMOD_F := $(objtree)/$(LSMOD) -endif -endif - localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated - $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config + $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \ (mv -f .config .config.old.1; \ @@ -58,7 +50,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf localyesconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated - $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config + $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)sed -i s/=m/=y/ .tmp.config $(Q)if [ -f .config ]; then \ cmp -s .tmp.config .config || \ diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index a4fe923..ae34d20 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -115,7 +115,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 $lsmod_file = $ENV{'LSMOD'}; my @makefiles = `find $ksource -name Makefile 2>/dev/null`; chomp @makefiles; @@ -296,7 +296,11 @@ my %modules; if (defined($lsmod_file)) { if ( ! -f $lsmod_file) { - die "$lsmod_file not found"; + if ( -f $ENV{'objtree'}."/".$lsmod_file) { + $lsmod_file = $ENV{'objtree'}."/".$lsmod_file; + } else { + die "$lsmod_file not found"; + } } if ( -x $lsmod_file) { # the file is executable, run it
Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> --- scripts/kconfig/Makefile | 12 ++---------- scripts/kconfig/streamline_config.pl | 8 ++++++-- 2 files changed, 8 insertions(+), 12 deletions(-)