Prev: Dear Winner
Next: [PATCHv3 1/3] USB: gadget: mass/file storage: set serial number
From: Arnaldo Carvalho de Melo on 8 Jul 2010 17:00
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(a)au1.ibm.com>
> Signed-off-by: Ian Munsie <imunsie(a)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(a)emilia linux-2.6-tip]$ make perf-tarbz2-src-pkg
TAR
[acme(a)emilia linux-2.6-tip]$ mv perf-2.6.35-rc4.tar.bz2 /tmp
[acme(a)emilia linux-2.6-tip]$ cd /tmp
[acme(a)emilia tmp]$ tar xf perf-2.6.35-rc4.tar.bz2
[acme(a)emilia tmp]$ cd perf-2.6.35-rc4/tools/perf
[acme(a)emilia perf]$ make
grep: ../../Makefile: No such file or directory
grep: ../../Makefile: No such file or directory

- Arnaldo
--
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/
From: Arnaldo Carvalho de Melo on 8 Jul 2010 17:10
Em Thu, Jul 08, 2010 at 05:57:54PM -0300, Arnaldo Carvalho de Melo escreveu:
> 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(a)au1.ibm.com>
> > Signed-off-by: Ian Munsie <imunsie(a)au1.ibm.com>
>
> > - 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(a)emilia linux-2.6-tip]$ make perf-tarbz2-src-pkg
> TAR
> [acme(a)emilia linux-2.6-tip]$ mv perf-2.6.35-rc4.tar.bz2 /tmp
> [acme(a)emilia linux-2.6-tip]$ cd /tmp
> [acme(a)emilia tmp]$ tar xf perf-2.6.35-rc4.tar.bz2
> [acme(a)emilia tmp]$ cd perf-2.6.35-rc4/tools/perf
> [acme(a)emilia perf]$ make
> grep: ../../Makefile: No such file or directory
> grep: ../../Makefile: No such file or directory

But at least the 'make perf-tar*' targets aren't in perf/urgent, so I'll
work on a fix for perf/core (aka 2.6.36).

- Arnaldo
--
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: Dear Winner
Next: [PATCHv3 1/3] USB: gadget: mass/file storage: set serial number