Prev: [PATCH] asus-laptop: fix asus_input_init error path
Next: [PATCH] bluetooth: btmrvl_sdio: silence warning
From: Thavidu Ranatunga on 5 Jul 2010 04:10
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(a)au1.ibm.com>
Signed-off-by: Ian Munsie <imunsie(a)au1.ibm.com>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] asus-laptop: fix asus_input_init error path
Next: [PATCH] bluetooth: btmrvl_sdio: silence warning