2010-07-05 07:59:47

by tip-bot for Thavidu Ranatunga

Subject: [PATCH 1/2] 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 <[email protected]>
Signed-off-by: Ian Munsie <[email protected]>
---
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 49ece79..1b32e8c 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) ;;
--
1.6.3.3

2010-07-05 08:46:16

by tip-bot for Thavidu Ranatunga

Subject: [tip:perf/urgent] perf: Version String fix, using kernel version

Commit-ID: 2190de2f59b3a371f7a5bf8dcc7a0c3f71723679
Gitweb: http://git.kernel.org/tip/2190de2f59b3a371f7a5bf8dcc7a0c3f71723679
Author: Thavidu Ranatunga <[email protected]>
AuthorDate: Mon, 5 Jul 2010 18:00:14 +1000
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 5 Jul 2010 10:42:58 +0200

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 <[email protected]>
Acked-by: Ian Munsie <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
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 49ece79..1b32e8c 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) ;;