* I did a git pull and a plus appeared
@ 2010-07-16 18:18 Pete Zaitcev
2010-07-16 20:02 ` Jeff Garzik
2010-07-17 20:04 ` David Rientjes
0 siblings, 2 replies; 6+ messages in thread
From: Pete Zaitcev @ 2010-07-16 18:18 UTC (permalink / raw)
To: linux-kbuild; +Cc: nico-linuxsetlocalversion, linux-kernel, zaitcev
Dear All:
I have a tree that existed for a few years (a clone of Linus' tree).
Today I did a git pull in it, and a plus appeared in the built version.
E.g. after "make modules_install":
[root@niphredil linux-2.6-tip]# ls /lib/modules/
2.6.33.1-19.fc13.x86_64 2.6.34-rc6-tip 2.6.35-rc1-tip
2.6.34-43.fc14.x86_64 2.6.35-0.36.rc4.git5.fc14.x86_64 2.6.35-rc5-tip+
[root@niphredil linux-2.6-tip]#
How do I get rid of the plus? I have (had for a long time):
[zaitcev@niphredil linux-2.6-tip]$ grep LOCAL .config
CONFIG_LOCALVERSION="-tip"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_X86_LOCAL_APIC=y
[zaitcev@niphredil linux-2.6-tip]$
Thanks,
-- Pete
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I did a git pull and a plus appeared
2010-07-16 18:18 I did a git pull and a plus appeared Pete Zaitcev
@ 2010-07-16 20:02 ` Jeff Garzik
2010-07-16 20:15 ` David Miller
2010-07-17 20:04 ` David Rientjes
1 sibling, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2010-07-16 20:02 UTC (permalink / raw)
To: Pete Zaitcev; +Cc: linux-kbuild, nico-linuxsetlocalversion, linux-kernel
On 07/16/2010 02:18 PM, Pete Zaitcev wrote:
> Dear All:
>
> I have a tree that existed for a few years (a clone of Linus' tree).
> Today I did a git pull in it, and a plus appeared in the built version.
> E.g. after "make modules_install":
>
> [root@niphredil linux-2.6-tip]# ls /lib/modules/
> 2.6.33.1-19.fc13.x86_64 2.6.34-rc6-tip 2.6.35-rc1-tip
> 2.6.34-43.fc14.x86_64 2.6.35-0.36.rc4.git5.fc14.x86_64 2.6.35-rc5-tip+
> [root@niphredil linux-2.6-tip]#
>
> How do I get rid of the plus? I have (had for a long time):
>
> [zaitcev@niphredil linux-2.6-tip]$ grep LOCAL .config
> CONFIG_LOCALVERSION="-tip"
> # CONFIG_LOCALVERSION_AUTO is not set
> CONFIG_X86_LOCAL_APIC=y
> [zaitcev@niphredil linux-2.6-tip]$
Is the '+' listed at the top of the toplevel Makefile?
Jeff
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I did a git pull and a plus appeared
2010-07-16 20:02 ` Jeff Garzik
@ 2010-07-16 20:15 ` David Miller
2010-07-17 0:26 ` Pete Zaitcev
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2010-07-16 20:15 UTC (permalink / raw)
To: jeff; +Cc: zaitcev, linux-kbuild, nico-linuxsetlocalversion, linux-kernel
From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 16 Jul 2010 16:02:25 -0400
> On 07/16/2010 02:18 PM, Pete Zaitcev wrote:
>> How do I get rid of the plus? I have (had for a long time):
>>
>> [zaitcev@niphredil linux-2.6-tip]$ grep LOCAL .config
>> CONFIG_LOCALVERSION="-tip"
>> # CONFIG_LOCALVERSION_AUTO is not set
>> CONFIG_X86_LOCAL_APIC=y
>> [zaitcev@niphredil linux-2.6-tip]$
>
> Is the '+' listed at the top of the toplevel Makefile?
It's being put there by Kbuild, this has been discussed quite a bit
over the past few weeks I think.
The "+" comes from scripts/setlocalversion
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I did a git pull and a plus appeared
2010-07-16 20:15 ` David Miller
@ 2010-07-17 0:26 ` Pete Zaitcev
2010-07-17 20:16 ` Nico Schottelius
0 siblings, 1 reply; 6+ messages in thread
From: Pete Zaitcev @ 2010-07-17 0:26 UTC (permalink / raw)
To: David Miller
Cc: jeff, linux-kbuild, nico-linuxsetlocalversion, linux-kernel,
zaitcev
On Fri, 16 Jul 2010 13:15:21 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:
> It's being put there by Kbuild, this has been discussed quite a bit
> over the past few weeks I think.
I suspected something like that, but finding the relevant discussion
afterwards is different.
> The "+" comes from scripts/setlocalversion
Right, found that quickly, but the question is what the authors' intent was.
I cannot tell from the code. Folks at #kernel seem to think the plus means
"built from a tarball", in which case this is a bug (the kernel was built
from a cloned tree).
I can easily add '+' to the list of filename characters in my terminal,
just thought to ask in case it's a bug.
-- Pete
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I did a git pull and a plus appeared
2010-07-17 0:26 ` Pete Zaitcev
@ 2010-07-17 20:16 ` Nico Schottelius
0 siblings, 0 replies; 6+ messages in thread
From: Nico Schottelius @ 2010-07-17 20:16 UTC (permalink / raw)
To: Pete Zaitcev
Cc: David Miller, jeff, linux-kbuild, nico-linuxsetlocalversion,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
Hey guys,
Pete Zaitcev [Fri, Jul 16, 2010 at 06:26:09PM -0600]:
> > The "+" comes from scripts/setlocalversion
>
> Right, found that quickly, but the question is what the authors' intent was.
> I cannot tell from the code. Folks at #kernel seem to think the plus means
> "built from a tarball", in which case this is a bug (the kernel was built
> from a cloned tree).
>
> I can easily add '+' to the list of filename characters in my terminal,
> just thought to ask in case it's a bug.
I'm soon on a long trip, has anybody fixed it already?
Otherwise I'm having a look at it.
Cheers,
Nico
--
New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0
Please resign, if you signed 9885188C or 8D0E27A4.
Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: I did a git pull and a plus appeared
2010-07-16 18:18 I did a git pull and a plus appeared Pete Zaitcev
2010-07-16 20:02 ` Jeff Garzik
@ 2010-07-17 20:04 ` David Rientjes
1 sibling, 0 replies; 6+ messages in thread
From: David Rientjes @ 2010-07-17 20:04 UTC (permalink / raw)
To: Pete Zaitcev; +Cc: linux-kbuild, nico-linuxsetlocalversion, linux-kernel
On Fri, 16 Jul 2010, Pete Zaitcev wrote:
> Dear All:
>
> I have a tree that existed for a few years (a clone of Linus' tree).
> Today I did a git pull in it, and a plus appeared in the built version.
> E.g. after "make modules_install":
>
> [root@niphredil linux-2.6-tip]# ls /lib/modules/
> 2.6.33.1-19.fc13.x86_64 2.6.34-rc6-tip 2.6.35-rc1-tip
> 2.6.34-43.fc14.x86_64 2.6.35-0.36.rc4.git5.fc14.x86_64 2.6.35-rc5-tip+
> [root@niphredil linux-2.6-tip]#
>
> How do I get rid of the plus? I have (had for a long time):
>
> [zaitcev@niphredil linux-2.6-tip]$ grep LOCAL .config
> CONFIG_LOCALVERSION="-tip"
> # CONFIG_LOCALVERSION_AUTO is not set
> CONFIG_X86_LOCAL_APIC=y
> [zaitcev@niphredil linux-2.6-tip]$
>
I initially added the `+' to the version string in 85a256d8 during this
release cycle. As the changelog indicates, it means that your tree is
beyond a tagged commit and LOCALVERSION= was not passed on the command
line so the tree must be described as a modified 2.6.35-rc5 kernel, for
example, instead of vanilla. That's the semantics that the `+' indicates.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-07-17 20:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-16 18:18 I did a git pull and a plus appeared Pete Zaitcev
2010-07-16 20:02 ` Jeff Garzik
2010-07-16 20:15 ` David Miller
2010-07-17 0:26 ` Pete Zaitcev
2010-07-17 20:16 ` Nico Schottelius
2010-07-17 20:04 ` David Rientjes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox