2010-08-16 10:58:29

by Jan Beulich

Subject: [PATCH] fixes for using make 3.82

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 <[email protected]>

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

2010-08-16 11:41:34

by Sam Ravnborg

Subject: Re: [PATCH] fixes for using make 3.82

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 <[email protected]>

Acked-by: Sam Ravnborg <[email protected]>
>
> ---
> 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
>
>

2010-08-16 11:52:53

by Jan Beulich

Subject: Re: [PATCH] fixes for using make 3.82

>>> On 16.08.10 at 13:41, Sam Ravnborg <[email protected]> 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

2010-08-16 13:17:43

by Andrew Benton

Subject: Re: [PATCH] fixes for using make 3.82

On 16/08/10 12:53, Jan Beulich wrote:
>>>> On 16.08.10 at 13:41, Sam Ravnborg<[email protected]> 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

2010-08-17 09:53:18

by Michal Marek

Subject: Re: [PATCH] fixes for using make 3.82

On 16.8.2010 12:58, 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 <[email protected]>
>
> ---
> firmware/Makefile | 2 +-
> scripts/mkmakefile | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)

Thanks, applied with Cc: <[email protected]>.

Michal