Re: [PATCH 2/2] perf: Version String fix, for fallback if not from git

[Arnaldo Carvalho de Melo <acme@redhat.com>]

Em Mon, Jul 05, 2010 at 06:00:15PM +1000, Thavidu Ranatunga escreveu:
> 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>
> Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>

>  	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}"

This makes 'make perf-tarbz2-src-pkg':

[acme@emilia linux-2.6-tip]$ make perf-tarbz2-src-pkg
  TAR
[acme@emilia linux-2.6-tip]$ mv perf-2.6.35-rc4.tar.bz2 /tmp
[acme@emilia linux-2.6-tip]$ cd /tmp
[acme@emilia tmp]$ tar xf perf-2.6.35-rc4.tar.bz2
[acme@emilia tmp]$ cd perf-2.6.35-rc4/tools/perf
[acme@emilia perf]$ make
grep: ../../Makefile: No such file or directory
grep: ../../Makefile: No such file or directory

- Arnaldo