Re: [PATCH, v2] kbuild: Improve version string logic

[David Rientjes]

On Tue, 13 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.
> 

The patch itself is good, it just needs a change to 
scripts/setlocalversion to suppress output when at a tagged commit.



scripts: suppress setlocalversion output if at tagged commit

It's unnecessary, even for CONFIG_LOCALVERSION_AUTO configs, to append
the "git describe" output to the version string if there are no revisions
beyond a tagged commit.

When the git respository was at the v2.6.32-rc4 tagged commit, for
example, the previous code would output "-00000-rc4," which is
unnecessary.

The comment in scripts/setlocalversion pertaining to this behavior need
not be changed since the implementation now conforms to the description.

Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
---
 scripts/setlocalversion |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -26,7 +26,8 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 		# If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),
 		# we pretty print it.
 		if atag="`git describe 2>/dev/null`"; then
-			echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+			echo "$atag" | awk -F- 'int($(NF-1)) > 0	\
+					{printf("-%05d-%s", $(NF-1),$(NF))}'
 
 		# If we don't have a tag at all we print -g{commitish}.
 		else
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/