* [PATCH 2/2] perf: Version String fix, for fallback if not from git
@ 2010-07-05 8:00 Thavidu Ranatunga
2010-07-05 8:45 ` [tip:perf/urgent] " tip-bot for Thavidu Ranatunga
2010-07-08 20:57 ` [PATCH 2/2] " Arnaldo Carvalho de Melo
0 siblings, 2 replies; 4+ messages in thread
From: Thavidu Ranatunga @ 2010-07-05 8:00 UTC (permalink / raw)
To: linux-kernel
Cc: Thavidu Ranatunga, Ian Munsie, Peter Zijlstra, Paul Mackerras,
Ingo Molnar, Arnaldo Carvalho de Melo
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>
---
tools/perf/util/PERF-VERSION-GEN | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 1b32e8c..97d7656 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -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*'\(.*\)')
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:perf/urgent] perf: Version String fix, for fallback if not from git
2010-07-05 8:00 [PATCH 2/2] perf: Version String fix, for fallback if not from git Thavidu Ranatunga
@ 2010-07-05 8:45 ` tip-bot for Thavidu Ranatunga
2010-07-08 20:57 ` [PATCH 2/2] " Arnaldo Carvalho de Melo
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Thavidu Ranatunga @ 2010-07-05 8:45 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, acme, paulus, tharan, hpa, mingo, a.p.zijlstra,
imunsie, tglx, mingo
Commit-ID: 869599ceda4a035cdb3345c563b74cdeef10f790
Gitweb: http://git.kernel.org/tip/869599ceda4a035cdb3345c563b74cdeef10f790
Author: Thavidu Ranatunga <tharan@au1.ibm.com>
AuthorDate: Mon, 5 Jul 2010 18:00:15 +1000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 5 Jul 2010 10:42:58 +0200
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>
---
tools/perf/util/PERF-VERSION-GEN | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 1b32e8c..97d7656 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -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*'\(.*\)')
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] perf: Version String fix, for fallback if not from git
2010-07-05 8:00 [PATCH 2/2] perf: Version String fix, for fallback if not from git Thavidu Ranatunga
2010-07-05 8:45 ` [tip:perf/urgent] " tip-bot for Thavidu Ranatunga
@ 2010-07-08 20:57 ` Arnaldo Carvalho de Melo
2010-07-08 21:02 ` Arnaldo Carvalho de Melo
1 sibling, 1 reply; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-07-08 20:57 UTC (permalink / raw)
To: Thavidu Ranatunga
Cc: linux-kernel, Ian Munsie, Peter Zijlstra, Paul Mackerras,
Ingo Molnar, Christoph Hellwig
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] perf: Version String fix, for fallback if not from git
2010-07-08 20:57 ` [PATCH 2/2] " Arnaldo Carvalho de Melo
@ 2010-07-08 21:02 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-07-08 21:02 UTC (permalink / raw)
To: Thavidu Ranatunga
Cc: linux-kernel, Ian Munsie, Peter Zijlstra, Paul Mackerras,
Ingo Molnar, Christoph Hellwig
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@au1.ibm.com>
> > Signed-off-by: Ian Munsie <imunsie@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@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
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-08 21:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-05 8:00 [PATCH 2/2] perf: Version String fix, for fallback if not from git Thavidu Ranatunga
2010-07-05 8:45 ` [tip:perf/urgent] " tip-bot for Thavidu Ranatunga
2010-07-08 20:57 ` [PATCH 2/2] " Arnaldo Carvalho de Melo
2010-07-08 21:02 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox