Commit 58d406ed authored by Josh Hunt's avatar Josh Hunt Committed by Arnaldo Carvalho de Melo

perf tools: Version incorrect with some versions of grep

Some versions of grep don't treat '\s' properly. When building perf on such
systems and using a kernel tarball the perf version is unable to be determined
from the main kernel Makefile and the user is left with a version of '..'.
Replacing the use of '\s' with '[[:space:]]', which should work in all grep
versions, gives a usable version number.
Reported-by: default avatarTapan Dhimant <tdhimant@akamai.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tapan Dhimant <tdhimant@akamai.com>
Cc: linux-kernel@vger.kernel.org
Cc: stable@kernel.org
LKML-Reference: <1300241800-30281-1-git-send-email-johunt@akamai.com>
Signed-off-by: default avatarJosh Hunt <johunt@akamai.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 38b435b1
...@@ -23,10 +23,10 @@ if test -d ../../.git -o -f ../../.git && ...@@ -23,10 +23,10 @@ if test -d ../../.git -o -f ../../.git &&
then then
VN=$(echo "$VN" | sed -e 's/-/./g'); VN=$(echo "$VN" | sed -e 's/-/./g');
else else
eval `grep '^VERSION\s*=' ../../Makefile|tr -d ' '` eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
eval `grep '^PATCHLEVEL\s*=' ../../Makefile|tr -d ' '` eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
eval `grep '^SUBLEVEL\s*=' ../../Makefile|tr -d ' '` eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
eval `grep '^EXTRAVERSION\s*=' ../../Makefile|tr -d ' '` eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}" VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
fi fi
......
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