I did a git pull and a plus appeared
in [Kernel]
|
Prev: [PATCH 3/3] perf probe: Fix the logic of die_compare_name
Next: [GIT PULL 0/3] perf/core fixes and improvements
From: Pete Zaitcev on 16 Jul 2010 14:20 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(a)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(a)niphredil linux-2.6-tip]# How do I get rid of the plus? I have (had for a long time): [zaitcev(a)niphredil linux-2.6-tip]$ grep LOCAL .config CONFIG_LOCALVERSION="-tip" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_X86_LOCAL_APIC=y [zaitcev(a)niphredil linux-2.6-tip]$ Thanks, -- Pete -- 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: Jeff Garzik on 16 Jul 2010 16:10 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(a)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(a)niphredil linux-2.6-tip]# > > How do I get rid of the plus? I have (had for a long time): > > [zaitcev(a)niphredil linux-2.6-tip]$ grep LOCAL .config > CONFIG_LOCALVERSION="-tip" > # CONFIG_LOCALVERSION_AUTO is not set > CONFIG_X86_LOCAL_APIC=y > [zaitcev(a)niphredil linux-2.6-tip]$ Is the '+' listed at the top of the toplevel Makefile? Jeff -- 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: David Miller on 16 Jul 2010 16:20 From: Jeff Garzik <jeff(a)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(a)niphredil linux-2.6-tip]$ grep LOCAL .config >> CONFIG_LOCALVERSION="-tip" >> # CONFIG_LOCALVERSION_AUTO is not set >> CONFIG_X86_LOCAL_APIC=y >> [zaitcev(a)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 -- 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: Pete Zaitcev on 16 Jul 2010 20:30 On Fri, 16 Jul 2010 13:15:21 -0700 (PDT) David Miller <davem(a)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 -- 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: David Rientjes on 17 Jul 2010 16:10
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(a)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(a)niphredil linux-2.6-tip]# > > How do I get rid of the plus? I have (had for a long time): > > [zaitcev(a)niphredil linux-2.6-tip]$ grep LOCAL .config > CONFIG_LOCALVERSION="-tip" > # CONFIG_LOCALVERSION_AUTO is not set > CONFIG_X86_LOCAL_APIC=y > [zaitcev(a)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. -- 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/ |