Prev: hugetlb: add allocate function for hugepage migration
Next: commit 6a4f3b52 causes invalid memtype
From: tip-bot for Thavidu Ranatunga on 5 Jul 2010 04:50
Commit-ID: 869599ceda4a035cdb3345c563b74cdeef10f790
Gitweb: http://git.kernel.org/tip/869599ceda4a035cdb3345c563b74cdeef10f790
Author: Thavidu Ranatunga <tharan(a)au1.ibm.com>
AuthorDate: Mon, 5 Jul 2010 18:00:15 +1000
Committer: Ingo Molnar <mingo(a)elte.hu>
CommitDate: Mon, 5 Jul 2010 10:42:58 +0200

perf: Version String fix, for fallback if not from git

This gets rid of the default version fallback for Perf and
changes it so that it returns the version of the kernel from
it's Makefile (if sources were not from git, ie. if it was
downloaded from a tarball)

Signed-off-by: Thavidu Ranatunga <tharan(a)au1.ibm.com>
Acked-by: Ian Munsie <imunsie(a)au1.ibm.com>
Acked-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
Cc: Paul Mackerras <paulus(a)samba.org>
Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com>
LKML-Reference: <1278316815-6099-2-git-send-email-tharan(a)au1.ibm.com>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
tools/perf/util/PERF-VERSION-GEN | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 1b32e8c..97d7656 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -5,17 +5,13 @@ if [ $# -eq 1 ] ; then
fi

GVF=${OUTPUT}PERF-VERSION-FILE
-DEF_VER=v0.0.2.PERF

LF='
'

-# First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
-if test -f version
-then
- VN=$(cat version) || VN="$DEF_VER"
-elif test -d ../../.git -o -f ../../.git &&
+# 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 describe --abbrev=4 HEAD 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
@@ -27,7 +23,12 @@ elif test -d ../../.git -o -f ../../.git &&
then
VN=$(echo "$VN" | sed -e 's/-/./g');
else
- VN="$DEF_VER"
+ eval `grep '^VERSION\s*=' ../../Makefile|tr -d ' '`
+ eval `grep '^PATCHLEVEL\s*=' ../../Makefile|tr -d ' '`
+ eval `grep '^SUBLEVEL\s*=' ../../Makefile|tr -d ' '`
+ eval `grep '^EXTRAVERSION\s*=' ../../Makefile|tr -d ' '`
+
+ VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
fi

VN=$(expr "$VN" : v*'\(.*\)')
--
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: hugetlb: add allocate function for hugepage migration
Next: commit 6a4f3b52 causes invalid memtype