* [PATCH] fixes for using make 3.82
@ 2010-08-16 10:58 Jan Beulich
2010-08-16 11:41 ` Sam Ravnborg
2010-08-17 9:50 ` Michal Marek
0 siblings, 2 replies; 6+ messages in thread
From: Jan Beulich @ 2010-08-16 10:58 UTC (permalink / raw)
To: sam; +Cc: linux-kernel
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>
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fixes for using make 3.82
2010-08-16 10:58 [PATCH] fixes for using make 3.82 Jan Beulich
@ 2010-08-16 11:41 ` Sam Ravnborg
2010-08-16 11:53 ` Jan Beulich
2010-08-17 9:50 ` Michal Marek
1 sibling, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2010-08-16 11:41 UTC (permalink / raw)
To: Jan Beulich, Michal Marek, linux-kbuild; +Cc: linux-kernel, Andrew Benton
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
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fixes for using make 3.82
2010-08-16 11:41 ` Sam Ravnborg
@ 2010-08-16 11:53 ` Jan Beulich
0 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2010-08-16 11:53 UTC (permalink / raw)
To: Sam Ravnborg, Michal Marek, linux-kbuild; +Cc: Andrew Benton, linux-kernel
>>> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fixes for using make 3.82
@ 2010-08-16 11:53 ` Jan Beulich
0 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2010-08-16 11:53 UTC (permalink / raw)
To: Sam Ravnborg, Michal Marek, linux-kbuild; +Cc: Andrew Benton, linux-kernel
>>> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fixes for using make 3.82
2010-08-16 11:53 ` Jan Beulich
(?)
@ 2010-08-16 13:17 ` Andrew Benton
-1 siblings, 0 replies; 6+ messages in thread
From: Andrew Benton @ 2010-08-16 13:17 UTC (permalink / raw)
To: Jan Beulich; +Cc: Sam Ravnborg, Michal Marek, linux-kbuild, linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fixes for using make 3.82
2010-08-16 10:58 [PATCH] fixes for using make 3.82 Jan Beulich
2010-08-16 11:41 ` Sam Ravnborg
@ 2010-08-17 9:50 ` Michal Marek
1 sibling, 0 replies; 6+ messages in thread
From: Michal Marek @ 2010-08-17 9:50 UTC (permalink / raw)
To: Jan Beulich; +Cc: sam, linux-kernel
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 <jbeulich@novell.com>
>
> ---
> firmware/Makefile | 2 +-
> scripts/mkmakefile | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
Thanks, applied with Cc: <stable@kernel.org>.
Michal
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-17 9:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-16 10:58 [PATCH] fixes for using make 3.82 Jan Beulich
2010-08-16 11:41 ` Sam Ravnborg
2010-08-16 11:53 ` Jan Beulich
2010-08-16 11:53 ` Jan Beulich
2010-08-16 13:17 ` Andrew Benton
2010-08-17 9:50 ` Michal Marek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.