|From:||Linus Torvalds <torvalds-AT-linux-foundation.org>|
|To:||Ingo Molnar <mingo-AT-elte.hu>|
|Subject:||Re: Linux 2.6.32-rc3|
|Date:||Tue, 6 Oct 2009 09:31:03 -0700 (PDT)|
|Cc:||Dirk Hohndel <hohndel-AT-infradead.org>, Len Brown <lenb-AT-kernel.org>, Linux Kernel Mailing List <linux-kernel-AT-vger.kernel.org>|
On Tue, 6 Oct 2009, Linus Torvalds wrote: > > Unless: > > > _That_ i think is a lot harder to confuse with the real .31 than a > > v2.6.31-1234-g16123c4 version string. > > .. are you saying that it would be just some automatically generated > thing, just a crippled form of CONFIG_LOCALVERSION_AUTO? Kind of a > CONFIG_LOCALVERSION_AUTO_SHORTFORM? So how about this? It changes how CONFIG_LOCALVERSION_AUTO works, in the following trivial way: - if it is set, things work the way they always have, and you get a extended kernel release like 2.6.32-rc3-00052-g0eca52a-dirty - but if it is _not_ set, we'll still try to get a version from the underlying SCM (we actually support git, hg and SVN right now, even if some comments may say "git only"), and if the underlying SCM says it has a local version, we append just "+", so you get a version number like 2.6.32-rc3+ IOW, you'd never get 2.6.32-rc0, but you'd get either the complex git version number (or SVN/hg/whatever), or at least "2.6.31+" with the "+" showing that it is more than plain 2.6.31. The "+" could be anything else, of course. The diff is pretty obvious, you can argue about exactly _what_ you'd like to see as a suffix for "and then some". Linus --- Makefile | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e50569a..c62b7cc 100644 --- a/Makefile +++ b/Makefile @@ -963,8 +963,6 @@ localver = $(subst $(space),, $(string) \ # .scmversion is used when generating rpm packages so we do not loose # the version information from the SCM when we do the build of the kernel # from the copied source -ifdef CONFIG_LOCALVERSION_AUTO - ifeq ($(wildcard .scmversion),) _localver-auto = $(shell $(CONFIG_SHELL) \ $(srctree)/scripts/setlocalversion $(srctree)) @@ -972,7 +970,14 @@ else _localver-auto = $(shell cat .scmversion 2> /dev/null) endif +ifdef CONFIG_LOCALVERSION_AUTO localver-auto = $(LOCALVERSION)$(_localver-auto) +else + ifeq ($_localver-auto,) + localver-auto = $(LOCALVERSION) + else + localver-auto = $(LOCALVERSION)+ + endif endif localver-full = $(localver)$(localver-auto)
Copyright © 2009, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds