Re: 2.6.9-rc1-mm2

[Tom Rini <trini@kernel.crashing.org>]

On Tue, Aug 31, 2004 at 09:41:35PM +0200, Sam Ravnborg wrote:
> On Tue, Aug 31, 2004 at 02:54:48PM -0400, Gene Heskett wrote:
> > make modules_install
> > /usr/src/linux-2.6.9-rc1-mm2/scripts/Makefile.modinst:24: target 
> > `fs/nls/nls_koi8-r.ko' given more than once in the same rule.
> > /usr/src/linux-2.6.9-rc1-mm2/scripts/Makefile.modinst:24: target 
> > `fs/nls/nls_koi8-ru.ko' given more than once in the same rule.
> > /usr/src/linux-2.6.9-rc1-mm2/scripts/Makefile.modinst:24: target 
> > `fs/nls/nls_koi8-u.ko' given more than once in the same rule.
> 
> Thanks!
> Know issue (reported off-list) - can be fixed with below patch.
> 
> 	Sam
> 
> # This is a BitKeeper generated diff -Nru style patch.
> #
> # ChangeSet
> #   2004/08/31 21:36:26+02:00 sam@mars.ravnborg.org 
> #   kbuild: Fix modules_install
> #   
> #   modules_install failed for modules with 'ko' in their name.
> #   Fixes this.
> #   
> #   Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> # 
> # scripts/Makefile.modinst
> #   2004/08/31 21:36:09+02:00 sam@mars.ravnborg.org +1 -1
> #   Fix installing of modules with ko in their name - do not find too many filenames in $(MODVERDIR)
> # 
> diff -Nru a/scripts/Makefile.modinst b/scripts/Makefile.modinst
> --- a/scripts/Makefile.modinst	2004-08-31 21:40:31 +02:00
> +++ b/scripts/Makefile.modinst	2004-08-31 21:40:31 +02:00
> @@ -9,7 +9,7 @@
>  
>  #
>  
> -__modules := $(sort $(shell grep -h .ko /dev/null $(wildcard $(MODVERDIR)/*.mod)))
> +__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
>  modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
>  
>  .PHONY: $(modules)

D'oh...  Wouldn't .modpost need the same change?

-- 
Tom Rini
http://gate.crashing.org/~trini/