* linux-next: build failure after merge of the kbuild-current tree
@ 2010-07-05 0:39 ` Stephen Rothwell
2010-07-05 21:43 ` Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored? Michal Marek
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-07-05 0:39 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi Michal,
After merging the libata tree, today's linux-next build produced this
warning (but it should be a failure ...):
/bin/sh: scripts/setlocalversion: No such file or directory
Probably introduced by commit 0a564b2645c8766a669c55bde1f1ef5b0518caec
("kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion").
That commit really isn't ready for inclusion in Linus' tree ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored?
2010-07-05 0:39 ` linux-next: build failure after merge of the kbuild-current tree Stephen Rothwell
@ 2010-07-05 21:43 ` Michal Marek
2010-07-06 18:29 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Michal Marek @ 2010-07-05 21:43 UTC (permalink / raw)
To: Stephen Rothwell, Rafael J. Wysocki
Cc: linux-next, linux-kernel, Linus Torvalds
On Mon, Jul 05, 2010 at 11:25:56PM +0200, Rafael J. Wysocki wrote:
> Hmm. Am I dong anything particularly wrong, or is CONFIG_LOCALVERSION ignored
> now, as it seems?
(also reported by Stephen earlier that day)
On Mon, Jul 05, 2010 at 10:39:41AM +1000, Stephen Rothwell wrote:
> After merging the libata tree, today's linux-next build produced this
> warning (but it should be a failure ...):
>
> /bin/sh: scripts/setlocalversion: No such file or directory
>
> Probably introduced by commit 0a564b2645c8766a669c55bde1f1ef5b0518caec
> ("kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion").
>
> That commit really isn't ready for inclusion in Linus' tree ...
Oops, I'm an idiot. The below patch should fix localversion again:
From: Michal Marek <mmarek@suse•cz>
Subject: [PATCH] kbuild: Fix path to scripts/setlocalversion
Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.
Reported-by: Stephen Rothwell <sfr@canb•auug.org.au>
Reported-by: Rafael J. Wysocki <rjw@sisk•pl>
Signed-off-by: Michal Marek <mmarek@suse•cz>
diff --git a/Makefile b/Makefile
index 12ab175..df16c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -886,7 +886,7 @@ $(vmlinux-dirs): prepare scripts
# Store (new) KERNELRELASE string in include/config/kernel.release
include/config/kernel.release: include/config/auto.conf FORCE
$(Q)rm -f $@
- $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
+ $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
# Things we need to do before we recursively start building the kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored?
2010-07-05 21:43 ` Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored? Michal Marek
@ 2010-07-06 18:29 ` Rafael J. Wysocki
2010-07-07 1:32 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2010-07-06 18:29 UTC (permalink / raw)
To: Michal Marek; +Cc: Stephen Rothwell, linux-next, linux-kernel, Linus Torvalds
On Monday, July 05, 2010, Michal Marek wrote:
> On Mon, Jul 05, 2010 at 11:25:56PM +0200, Rafael J. Wysocki wrote:
> > Hmm. Am I dong anything particularly wrong, or is CONFIG_LOCALVERSION ignored
> > now, as it seems?
>
> (also reported by Stephen earlier that day)
>
> On Mon, Jul 05, 2010 at 10:39:41AM +1000, Stephen Rothwell wrote:
> > After merging the libata tree, today's linux-next build produced this
> > warning (but it should be a failure ...):
> >
> > /bin/sh: scripts/setlocalversion: No such file or directory
> >
> > Probably introduced by commit 0a564b2645c8766a669c55bde1f1ef5b0518caec
> > ("kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion").
> >
> > That commit really isn't ready for inclusion in Linus' tree ...
>
>
> Oops, I'm an idiot. The below patch should fix localversion again:
Yes, it helps here.
Thanks,
Rafael
> From: Michal Marek <mmarek@suse•cz>
> Subject: [PATCH] kbuild: Fix path to scripts/setlocalversion
>
> Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.
>
> Reported-by: Stephen Rothwell <sfr@canb•auug.org.au>
> Reported-by: Rafael J. Wysocki <rjw@sisk•pl>
> Signed-off-by: Michal Marek <mmarek@suse•cz>
>
> diff --git a/Makefile b/Makefile
> index 12ab175..df16c4f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -886,7 +886,7 @@ $(vmlinux-dirs): prepare scripts
> # Store (new) KERNELRELASE string in include/config/kernel.release
> include/config/kernel.release: include/config/auto.conf FORCE
> $(Q)rm -f $@
> - $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
> + $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
>
>
> # Things we need to do before we recursively start building the kernel
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored?
2010-07-06 18:29 ` Rafael J. Wysocki
@ 2010-07-07 1:32 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2010-07-07 1:32 UTC (permalink / raw)
To: Michal Marek; +Cc: Rafael J. Wysocki, linux-next, linux-kernel, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
Hi Michal,
On Tue, 6 Jul 2010 20:29:34 +0200 "Rafael J. Wysocki" <rjw@sisk•pl> wrote:
>
> On Monday, July 05, 2010, Michal Marek wrote:
> > On Mon, Jul 05, 2010 at 11:25:56PM +0200, Rafael J. Wysocki wrote:
> > > Hmm. Am I dong anything particularly wrong, or is CONFIG_LOCALVERSION ignored
> > > now, as it seems?
> >
> > (also reported by Stephen earlier that day)
> >
> > On Mon, Jul 05, 2010 at 10:39:41AM +1000, Stephen Rothwell wrote:
> > > After merging the libata tree, today's linux-next build produced this
> > > warning (but it should be a failure ...):
> > >
> > > /bin/sh: scripts/setlocalversion: No such file or directory
> > >
> > > Probably introduced by commit 0a564b2645c8766a669c55bde1f1ef5b0518caec
> > > ("kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion").
> > >
> > > That commit really isn't ready for inclusion in Linus' tree ...
> >
> >
> > Oops, I'm an idiot. The below patch should fix localversion again:
>
> Yes, it helps here.
I also applied it to linux-next yesterday (in my fixes tree) and it
solves the problem.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-07 1:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <201007052325.56971.rjw@sisk.pl>
2010-07-05 0:39 ` linux-next: build failure after merge of the kbuild-current tree Stephen Rothwell
2010-07-05 21:43 ` Linux 2.6.35-rc4 - CONFIG_LOCALVERSION ignored? Michal Marek
2010-07-06 18:29 ` Rafael J. Wysocki
2010-07-07 1:32 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox