Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933565AbZJMHIF (ORCPT ); Tue, 13 Oct 2009 03:08:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933330AbZJMHIF (ORCPT ); Tue, 13 Oct 2009 03:08:05 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:39844 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933192AbZJMHID (ORCPT ); Tue, 13 Oct 2009 03:08:03 -0400 Date: Tue, 13 Oct 2009 09:07:13 +0200 From: Ingo Molnar To: David Rientjes Cc: Linus Torvalds , Frans Pop , Dirk Hohndel , Len Brown , Linux Kernel Mailing List Subject: Re: [PATCH, v2] kbuild: Improve version string logic Message-ID: <20091013070713.GD31483@elte.hu> References: <1254797502.14122.146.camel@dhohndel-mobl.amr.corp.intel.com> <20091006144449.GA23078@elte.hu> <20091006153632.GA29795@elte.hu> <20091006173508.GA4786@elte.hu> <20091012195733.GA7351@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2174 Lines: 58 * David Rientjes wrote: > On Mon, 12 Oct 2009, Ingo Molnar wrote: > > > 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) > > I don't see where the `+' is dropped between -rc tags; > scripts/setlocalversion should return -00000-rc5 for v2.6.32-rc5, for > example, so _localver-auto will always be non-NULL and the `+' is > appended. > > I think scripts/setlocalversion should also be modified as I earlier > suggested to suppress output when git-describe shows no additional > commits beyond the tag. Then, CONFIG_LOCALVERSION_AUTO would not be > v2.6.32-rc4-00000-rc4, for example, when 2.6.32-rc4 is released. > > Your patch also adds the make LOCALVERSION= string to the version > without requiring CONFIG_LOCALVERSION_AUTO. That's a change from > prior behavior, but I think it's helpful for user-specified version > tags. Good points - the patch is defective in its current form. Anyone interested in fixing it? I'll be busy with other things. Ingo -- 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/