From: Boaz Harrosh <bharrosh@panasas.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Frans Pop <elendil@planet.nl>,
Dirk Hohndel <hohndel@infradead.org>, Len Brown <lenb@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH, v2] kbuild: Improve version string logic - two for the price of one - No thanks
Date: Mon, 07 Jun 2010 20:18:22 +0300 [thread overview]
Message-ID: <4C0D29DE.6050602@panasas.com> (raw)
In-Reply-To: <20091012195733.GA7351@elte.hu>
On 10/12/2009 09:57 PM, Ingo Molnar wrote:
>
> This is basically your original patch that adds '+' to the short version
> string of kernels that are 'between' -rc tags. (i dropped the '+' within
> the long version i did in v1 - there were objections against that)
>
> Would this be ok?
>
Rrrr. If I wanted CONFIG_LOCALVERSION_AUTO, I would use that one. At least
it is actually useful and informative.
I already have my:
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 35
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc2-my_tree
Which is managed by a git tree (for everybody based on my tree)
At least give us a way out with:
CONFIG_LOCALVERSION_NO_AUTO_IM_REALLY_STUPID=y way out.
or EXTRAVERSION != $(git version)
But don't leave us cold in the woods like that. (What if I remove the git tree altogether, move to svn)
If I can shoot my self in the foot, it does not mean Government should not issue any more
gun licenses.
I already have my outer Makefile system that makes sure I don't forget to compile, or
"did I install this Kernel or not". Please let us have a way out?
Boaz
> Ingo
>
> -------------->
>>From 597e5b15dd0cbb3158afc438e5edae9986e6b76a Mon Sep 17 00:00:00 2001
> From: Linus Torvalds <torvalds@linux-foundation.org>
> Date: Tue, 6 Oct 2009 09:31:03 -0700
> Subject: [PATCH] kbuild: Improve version string logic
>
> 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
>
> - 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.
>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> Cc: Frans Pop <elendil@planet.nl>
> Cc: Dirk Hohndel <hohndel@infradead.org>
> Cc: Len Brown <lenb@kernel.org>
> LKML-Reference: <20091006173508.GA4786@elte.hu>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
> Makefile | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 927d7a3..5dab509 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)
> --
> 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/
>
next prev parent reply other threads:[~2010-06-07 17:18 UTC|newest]
Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-05 0:44 Linux 2.6.32-rc3 Linus Torvalds
2009-10-05 18:55 ` James Cloos
2009-10-06 1:57 ` Len Brown
2009-10-06 2:51 ` Dirk Hohndel
2009-10-06 14:18 ` Linus Torvalds
2009-10-06 14:38 ` Dirk Hohndel
2009-10-06 15:13 ` Linus Torvalds
2009-10-06 15:34 ` Dirk Hohndel
2009-10-06 15:43 ` Linus Torvalds
[not found] ` <4ACBB7D7.10207@urpla.net>
2009-10-06 22:13 ` Linus Torvalds
2009-10-06 16:36 ` Frans Pop
2009-10-07 1:09 ` Bryan Donlan
2009-10-07 5:56 ` Frans Pop
2009-10-06 14:44 ` Ingo Molnar
2009-10-06 15:24 ` Linus Torvalds
2009-10-06 15:36 ` Ingo Molnar
2009-10-06 15:51 ` Linus Torvalds
2009-10-06 16:29 ` Ingo Molnar
2009-10-06 16:35 ` Ingo Molnar
2009-10-06 16:31 ` Linus Torvalds
2009-10-06 16:40 ` Ingo Molnar
2009-10-06 18:12 ` Theodore Tso
2009-10-06 18:24 ` Ingo Molnar
2009-10-06 21:19 ` Stefan Richter
2009-10-06 17:15 ` Stefan Richter
2009-10-06 18:16 ` Ingo Molnar
2009-10-06 17:22 ` Frans Pop
2009-10-06 17:32 ` Linus Torvalds
2009-10-06 18:29 ` Frans Pop
2009-10-07 0:51 ` Florian Mickler
2009-10-06 17:35 ` [patch] kbuild: Improve version string logic Ingo Molnar
2009-10-06 18:37 ` Johannes Berg
2009-10-06 18:49 ` Ingo Molnar
2009-10-06 18:55 ` Johannes Berg
2009-10-06 19:03 ` Theodore Tso
2009-10-06 19:45 ` Frans Pop
2009-10-06 19:48 ` Johannes Berg
2009-10-06 20:25 ` Frans Pop
2009-10-07 2:43 ` David Rientjes
2009-10-12 19:57 ` [PATCH, v2] " Ingo Molnar
2009-10-12 22:04 ` Frans Pop
2009-10-13 7:05 ` Ingo Molnar
2009-10-13 17:51 ` Frans Pop
2009-10-13 18:01 ` Linus Torvalds
2009-10-13 23:59 ` David Rientjes
2009-10-14 6:59 ` Ingo Molnar
2009-10-14 7:24 ` David Rientjes
2009-10-14 7:33 ` Ingo Molnar
2009-10-14 7:42 ` David Rientjes
2009-10-14 23:43 ` Frans Pop
2009-10-15 7:37 ` David Rientjes
2009-10-15 14:13 ` Frans Pop
2009-10-15 20:38 ` David Rientjes
2009-10-15 21:01 ` Frans Pop
2009-10-15 9:03 ` Ingo Molnar
2009-10-15 14:42 ` Frans Pop
2009-10-15 20:45 ` David Rientjes
2009-10-15 8:01 ` David Rientjes
2009-10-15 8:59 ` Ingo Molnar
2009-10-14 21:55 ` Frans Pop
2009-10-13 2:00 ` David Rientjes
2009-10-13 7:07 ` Ingo Molnar
2009-10-13 7:59 ` David Rientjes
2010-06-07 17:18 ` Boaz Harrosh [this message]
2010-06-07 19:45 ` [PATCH, v2] kbuild: Improve version string logic - two for the price of one - No thanks David Rientjes
2010-06-08 5:52 ` Boaz Harrosh
2010-06-08 6:18 ` David Rientjes
2010-06-08 6:34 ` Paul Mundt
2010-06-08 6:39 ` Boaz Harrosh
2010-06-08 7:16 ` Boaz Harrosh
2010-06-08 7:21 ` Paul Mundt
2010-06-08 7:21 ` Boaz Harrosh
2010-06-08 7:32 ` Paul Mundt
2010-06-08 7:52 ` Boaz Harrosh
2010-06-08 9:17 ` David Rientjes
2010-06-08 6:37 ` Boaz Harrosh
2010-06-08 8:31 ` kbuild: Fix the breakage caused by "improve version string logic" Boaz Harrosh
2010-06-08 9:13 ` David Rientjes
2010-06-08 10:14 ` Boaz Harrosh
2010-06-08 10:19 ` Boaz Harrosh
2010-06-09 6:55 ` David Rientjes
2010-06-09 7:54 ` Boaz Harrosh
2010-06-09 8:18 ` Mike Galbraith
2009-10-06 17:40 ` Linux 2.6.32-rc3 Len Brown
2009-10-06 18:16 ` Linus Torvalds
2009-10-07 22:33 ` Len Brown
2009-10-06 17:45 ` Dirk Hohndel
2009-10-06 19:22 ` Joel Becker
[not found] ` <4ACB77ED.6060104@grm.uci.cu>
2009-10-06 18:00 ` Herlin R. Matos Lastres
2009-10-15 15:51 ` Frans Pop
2009-10-06 15:42 ` Linus Torvalds
2009-10-06 17:09 ` Frans Pop
2009-10-06 17:34 ` Stefan Richter
2009-10-06 17:41 ` Linus Torvalds
2009-10-06 18:56 ` david
2009-10-06 18:23 ` Frans Pop
2009-10-06 19:23 ` Stefan Richter
2009-10-06 17:44 ` Theodore Tso
2009-10-06 18:14 ` Theodore Tso
2009-10-06 18:20 ` Linus Torvalds
2009-10-06 16:40 ` Frans Pop
2009-10-06 18:35 ` Linus Torvalds
2009-10-06 19:37 ` Frans Pop
2009-10-07 21:39 ` Steven Rostedt
2009-10-08 15:20 ` Frans Pop
2009-10-06 15:29 ` Stefan Richter
2009-10-06 17:08 ` Ingo Molnar
2009-10-06 17:20 ` Stefan Richter
2009-10-06 21:33 ` Benjamin Herrenschmidt
2009-10-06 22:19 ` Linus Torvalds
2009-10-07 1:22 ` Dave Airlie
2009-10-07 2:31 ` Theodore Tso
2009-10-07 2:45 ` Benjamin Herrenschmidt
2009-10-10 12:09 ` Pavel Machek
2009-10-10 12:18 ` Felipe Contreras
2009-10-07 3:23 ` Linus Torvalds
2009-10-07 3:31 ` Linus Torvalds
2009-10-07 13:52 ` Theodore Tso
2009-10-07 14:52 ` Mike Galbraith
2009-10-07 17:44 ` david
2009-10-07 18:13 ` Mike Galbraith
2009-10-07 4:02 ` Justin P. Mattock
2009-10-07 10:41 ` 2.6.32-rc3: floating-point build failure (undefined reference to `__udivdi3' in menu governor) Andreas Mohr
2009-10-07 14:23 ` Arjan van de Ven
2009-10-07 17:34 ` Andreas Mohr
2009-10-07 17:45 ` Arjan van de Ven
2009-10-07 17:45 ` Kyle McMartin
2009-10-09 16:01 ` Andreas Mohr
2009-10-09 16:32 ` Arjan van de Ven
2009-10-09 17:08 ` Kyle McMartin
2009-10-09 17:12 ` Arjan van de Ven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C0D29DE.6050602@panasas.com \
--to=bharrosh@panasas.com \
--cc=elendil@planet.nl \
--cc=hohndel@infradead.org \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).