Re: [PATCH] perf tools: Fix perf version generation

[Borislav Petkov]

Hey acme,

is this one in some queue already?

I just saw the same problem on 3.10 because git-tag sorts the output
alphanumerically so that all tags starting with "v3.10" do not appear
last and thus the "tail -1" doesn't work anymore.

So on 3.10 you end up with perf version 3.9.rc8.g8bb495.

On Wed, May 08, 2013 at 11:43:34AM +0200, Robert Richter wrote:
> From: Robert Richter <robert.richter@xxxxxxxxxxx>
> 
> The tag of the perf version is wrongly determined, always the latest
> tag is taken regardless of the HEAD commit:
> 
>  $ perf --version
>  perf version 3.9.rc8.gd7f5d3
>  $ git describe d7f5d3
>  v3.9-rc7-154-gd7f5d33
>  $ head -n 4 Makefile
>  VERSION = 3
>  PATCHLEVEL = 9
>  SUBLEVEL = 0
>  EXTRAVERSION = -rc7
> 
> In other cases no tag might be found.
> 
> This patch fixes this.
> 
> This new implementation handles also the case if there are no tags at
> all found in the git repo but there is a commit id.
> 
> Signed-off-by: Robert Richter <robert.richter@xxxxxxxxxxx>
> ---
>  tools/perf/util/PERF-VERSION-GEN | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
> index 055fef3..15a77b7 100755
> --- a/tools/perf/util/PERF-VERSION-GEN
> +++ b/tools/perf/util/PERF-VERSION-GEN
> @@ -13,13 +13,22 @@ LF='
>  # First check if there is a .git to get the version from git describe
>  # otherwise try to get the version from the kernel Makefile
>  #
> -if test -d ../../.git -o -f ../../.git &&
> -	VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*")
> +CID=
> +TAG=
> +if test -d ../../.git -o -f ../../.git
>  then
> -	VN=$(echo $VN"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD))
> -	VN=$(echo "$VN" | sed -e 's/-/./g');
> -else
> -	VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
> +	TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null )
> +	CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID"
> +fi
> +if test -z "$TAG"
> +then
> +	TAG=$(MAKEFLAGS= make -sC ../.. kernelversion)
> +fi
> +VN="$TAG$CID"
> +if test -n "$CID"
> +then
> +	# format version string, strip trailing zero of sublevel:
> +	VN=$(echo "$VN" | sed -e 's/-/./g;s/\([0-9]*[.][0-9]*\)[.]0/\1/')
>  fi
>  
>  VN=$(expr "$VN" : v*'\(.*\)')
> -- 
> 1.8.1.1
> 
> --
> 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/
> 

-- 
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
--
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/