From: Rafael J. Wysocki on
On Monday, July 05, 2010, Linus Torvalds wrote:
> Hey everybody, there's finally a new -rc out there..
>
> I've been back online for a week, and at least judging by the kinds of
> patches and pull requests I've been getting, I have to say that I
> think that having been strict for -rc3 ended up working out pretty
> well. The diffstat of rc3..rc4 looks quite reasonable, despite the
> longer window between rc's. And while there were certainly some things
> that needed fixing, I'm hoping that we'll have a timely 2.6.35 release
> despite my vacation (my longest time away from the kernel in many
> years, I do believe - I followed email on a cellphone, but did not a
> single kernel compile, and had a great time under water).
>
> So go out and test -rc4. It fixes a number of regressions, a couple of
> them harking back to from before 2.6.34. Networking, cfq, i915 and
> radeo. And filesystem writeback performance issues, etc. It's all
> good.

Hmm. Am I dong anything particularly wrong, or is CONFIG_LOCALVERSION ignored
now, as it seems?

Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Michal Marek on
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(a)suse.cz>
Subject: [PATCH] kbuild: Fix path to scripts/setlocalversion

Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.

Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Reported-by: Rafael J. Wysocki <rjw(a)sisk.pl>
Signed-off-by: Michal Marek <mmarek(a)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(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Rafael J. Wysocki on
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(a)suse.cz>
> Subject: [PATCH] kbuild: Fix path to scripts/setlocalversion
>
> Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.
>
> Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
> Reported-by: Rafael J. Wysocki <rjw(a)sisk.pl>
> Signed-off-by: Michal Marek <mmarek(a)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(a)vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on
Hi Michal,

On Tue, 6 Jul 2010 20:29:34 +0200 "Rafael J. Wysocki" <rjw(a)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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Benny Halevy on
On Jul. 06, 2010, 0:25 +0300, "Rafael J. Wysocki" <rjw(a)sisk.pl> wrote:
> On Monday, July 05, 2010, Linus Torvalds wrote:
>> Hey everybody, there's finally a new -rc out there..
>>
>> I've been back online for a week, and at least judging by the kinds of
>> patches and pull requests I've been getting, I have to say that I
>> think that having been strict for -rc3 ended up working out pretty
>> well. The diffstat of rc3..rc4 looks quite reasonable, despite the
>> longer window between rc's. And while there were certainly some things
>> that needed fixing, I'm hoping that we'll have a timely 2.6.35 release
>> despite my vacation (my longest time away from the kernel in many
>> years, I do believe - I followed email on a cellphone, but did not a
>> single kernel compile, and had a great time under water).
>>
>> So go out and test -rc4. It fixes a number of regressions, a couple of
>> them harking back to from before 2.6.34. Networking, cfq, i915 and
>> radeo. And filesystem writeback performance issues, etc. It's all
>> good.
>
> Hmm. Am I dong anything particularly wrong, or is CONFIG_LOCALVERSION ignored
> now, as it seems?

Not working for me either in 2.6.35-rc4.

Note that I have a localversion-xxxx file in my root directory
which is also ignored, regardless of CONFIG_LOCALVERSION
and CONFIG_LOCALVERSION_AUTO.

Benny

>
> Rafael
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo(a)vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/