Re: [PATCH] fixes for using make 3.82

From: Sam Ravnborg
Date: Mon Aug 16 2010 - 07:41:37 EST


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@xxxxxxxxxx>

Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
>
> ---
> 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
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/