diff options
| author | Robert Richter <robert.richter@calxeda.com> | 2013-05-08 09:43:34 (GMT) |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-07-08 21:09:52 (GMT) |
| commit | a4147f0f91386540316e468f3a3674a498dada5f (patch) | |
| tree | ba9ee1366e013a0589c58c275e0fe54d3b19c8df /tools/perf | |
| parent | 582ec0829b3dd74d8c0f58403a3f9df8cbaa9c7d (diff) | |
| download | linux-fsl-qoriq-a4147f0f91386540316e468f3a3674a498dada5f.tar.xz | |
perf tools: Fix perf version generation
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@calxeda.com>
Link: http://lkml.kernel.org/r/1368006214-12912-1-git-send-email-rric@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rwxr-xr-x | tools/perf/util/PERF-VERSION-GEN | 21 |
1 files 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*'\(.*\)') |