Re: [PATCH] fixes for using make 3.82

Re: [PATCH] fixes for using make 3.82

[Sam Ravnborg]

Added: Michael Marek (kbuild maintainer) + linux-kbuild.

I assume this fixes firmware build reported by Andrew Benton (cc:ed).

	Sam

On Mon, Aug 16, 2010 at 11:58:58AM +0100, Jan Beulich wrote:
> It doesn't like pattern and explicit rules to be on the same line,
> and it seems to be more picky when matching file (or really directory)
> names with different numbers of trailing slashes.
> 
> Signed-off-by: Jan Beulich <jbeulich@novell.com>

Acked-by: Sam Ravnborg <sam@ravnborg.org>
> 
> ---
>  firmware/Makefile  |    2 +-
>  scripts/mkmakefile |    4 +++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> --- linux-2.6.36-rc1/firmware/Makefile
> +++ 2.6.36-rc1-make-3.82-fixes/firmware/Makefile
> @@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin
>  fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
>  
>  # Directories which we _might_ need to create, so we have a rule for them.
> -firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all))))
> +firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))
>  
>  quiet_cmd_mkdir = MKDIR   $(patsubst $(objtree)/%,%,$@)
>        cmd_mkdir = mkdir -p $@
> --- linux-2.6.36-rc1/scripts/mkmakefile
> +++ 2.6.36-rc1-make-3.82-fixes/scripts/mkmakefile
> @@ -44,7 +44,9 @@ all:
>  
>  Makefile:;
>  
> -\$(all) %/: all
> +\$(all): all
>  	@:
>  
> +%/: all
> +	@:
>  EOF
> 
> 

Re: [PATCH] fixes for using make 3.82

[Jan Beulich]

>>> On 16.08.10 at 13:41, Sam Ravnborg <sam@ravnborg.org> wrote:
> Added: Michael Marek (kbuild maintainer) + linux-kbuild.
> 
> I assume this fixes firmware build reported by Andrew Benton (cc:ed).

Yes, it does (I had observed the same, which prompted the fix).

Jan

Re: [PATCH] fixes for using make 3.82

[Andrew Benton]

On 16/08/10 12:53, Jan Beulich wrote:
>>>> On 16.08.10 at 13:41, Sam Ravnborg<sam@ravnborg.org>  wrote:
>> Added: Michael Marek (kbuild maintainer) + linux-kbuild.
>>
>> I assume this fixes firmware build reported by Andrew Benton (cc:ed).
>
> Yes, it does (I had observed the same, which prompted the fix).
>

I can confirm that the patch fixes the problem, I can compile the kernel 
with make-3.82.
Many thanks.

Andy