Commit 869599ce authored by Thavidu Ranatunga's avatar Thavidu Ranatunga Committed by Ingo Molnar

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: default avatarThavidu Ranatunga <tharan@au1.ibm.com>
Acked-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1278316815-6099-2-git-send-email-tharan@au1.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2190de2f
...@@ -5,17 +5,13 @@ if [ $# -eq 1 ] ; then ...@@ -5,17 +5,13 @@ if [ $# -eq 1 ] ; then
fi fi
GVF=${OUTPUT}PERF-VERSION-FILE GVF=${OUTPUT}PERF-VERSION-FILE
DEF_VER=v0.0.2.PERF
LF=' LF='
' '
# First see if there is a version file (included in release tarballs), # First check if there is a .git to get the version from git describe
# then try git-describe, then default. # otherwise try to get the version from the kernel makefile
if test -f version if test -d ../../.git -o -f ../../.git &&
then
VN=$(cat version) || VN="$DEF_VER"
elif test -d ../../.git -o -f ../../.git &&
VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
case "$VN" in case "$VN" in
*$LF*) (exit 1) ;; *$LF*) (exit 1) ;;
...@@ -27,7 +23,12 @@ elif test -d ../../.git -o -f ../../.git && ...@@ -27,7 +23,12 @@ elif test -d ../../.git -o -f ../../.git &&
then then
VN=$(echo "$VN" | sed -e 's/-/./g'); VN=$(echo "$VN" | sed -e 's/-/./g');
else 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 fi
VN=$(expr "$VN" : v*'\(.*\)') VN=$(expr "$VN" : v*'\(.*\)')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment