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@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-2-git-send-email-tharan@au1.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
2190de2f59
commit
869599ceda
|
@ -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*'\(.*\)')
|
||||
|
|
Loading…
Reference in New Issue