diff options
| author | Thavidu Ranatunga <tharan@au1.ibm.com> | 2010-07-05 18:00:14 +1000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-05 10:42:58 +0200 |
| commit | 2190de2f59b3a371f7a5bf8dcc7a0c3f71723679 (patch) | |
| tree | 32f391645b54dde6b9714e8b6237a91cd71f45bc /tools/perf/util/PERF-VERSION-GEN | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
| download | lwn-2190de2f59b3a371f7a5bf8dcc7a0c3f71723679.tar.gz lwn-2190de2f59b3a371f7a5bf8dcc7a0c3f71723679.zip | |
perf: Version String fix, using kernel version
Changes the Perf --version string such that it shows the kernel
version as suggested by Ingo as follows:
That way the perf that comes with v2.6.34 will be:
perf version v2.6.34
while interim versions will have the version of the interim
kernel - for example:
perf version v2.6.35-rc4-70-g39ef13a
This functionality was already in the perf version generator
file except that it was looking for a .git in the perf directory
instead of the kernel directory.
Signed-off-by: Thavidu Ranatunga <tharan@au1.ibm.com>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1278316815-6099-1-git-send-email-tharan@au1.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/PERF-VERSION-GEN')
| -rwxr-xr-x | tools/perf/util/PERF-VERSION-GEN | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 49ece7921914..1b32e8c0253f 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -15,7 +15,7 @@ LF=' if test -f version then VN=$(cat version) || VN="$DEF_VER" -elif test -d .git -o -f .git && +elif test -d ../../.git -o -f ../../.git && VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; |