[PATCH 3/4] kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl

[Steven Rostedt]

[Steven Rostedt]

[Steven Rostedt]

[Steven Rostedt]

[Michal Marek]

On Wed, Feb 03, 2010 at 10:46:09AM -0500, Steven Rostedt wrote:
> +# 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 LSMOD
LSMOD_F := $(LSMOD)
ifeq ($(findstring /,$(LSMOD)),)
LSMOD_F := $(objtree)/$(LSMOD)
endif
endif

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Steven Rostedt]

On Wed, 2010-02-03 at 17:07 +0100, Michal Marek wrote:
> On Wed, Feb 03, 2010 at 10:46:09AM -0500, Steven Rostedt wrote:
> > +# 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 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

[Michal Marek]

Signed-off-by: Michal Marek <mma...@suse.cz>
---
scripts/kconfig/Makefile | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 85b9065..186c466 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -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
--
1.6.5.3

[Steven Rostedt]

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 <mma...@suse.cz>
Date: Wed Feb 3 17:20:14 2010 +0100

kconfig: Simplify LSMOD= handling

Signed-off-by: Michal Marek <mma...@suse.cz>
LKML-Reference: <20100203162...@sepie.suse.cz>
Signed-off-by: Steven Rostedt <ros...@goodmis.org>

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 85b9065..186c466 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -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

--