perf: Fix version when building out of tree - v2
Subsystems (2)
PATCH 1/1 perf: Fix version when building out of tree - v2
When building perf out of tree
make perf-tar-src-pkg
tar -xf perf-<ver>.tar -C /tmp
cd /tmp/perf<ver>
make -C tools/perf
you get the warning message:
make[1]: *** No rule to make target `kernelversion'. Stop.
Fix by saving the perf version in the tar file and using that for the out of tree builds.
v2: removed short form request and fixed up version string from usual output
--- scripts/package/Makefile | 4 +++- tools/perf/util/PERF-VERSION-GEN | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
scripts/package/Makefile +3 -1
@@ -115,7 +115,9 @@ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ -o $(perf-tar).tar; \ mkdir -p $(perf-tar); \ git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ -tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ +(cd $(srctree)/tools/perf; \ +util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null); \ +tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \ $(if $(findstring bz2,$@),bzip2, \
tools/perf/util/PERF-VERSION-GEN +3 -0
@@ -19,6 +19,9 @@ if test -d ../../.git -o -f ../../.git then TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" +elif test -f ../../PERF-VERSION-FILE +then + TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g') fi if test -z "$TAG" then
Signature · 1 line
1.8.3.4 (Apple Git-47)
Quoted 44 lines · David Ahern
When building perf out of tree
make perf-tar-src-pkg
tar -xf perf-<ver>.tar -C /tmp
cd /tmp/perf<ver>
make -Ctools/perfyou get the warning message:
make[1]: *** No rule to make target `kernelversion'. Stop.Fix by saving the perf version in the tar file and using that for the out of tree builds.
v2: removed short form request and fixed up version string from usual output
Suggested-by Ingo Molnar <[email protected]>Signed-off-by David Ahern <[email protected]>Cc Ingo Molnar <[email protected]>Cc Namhyung Kim <[email protected]>Cc Jiri Olsa <[email protected]>--- scripts/package/Makefile | 4 +++- tools/perf/util/PERF-VERSION-GEN | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)scripts/package/Makefile +3
-1@@ -115,7 +115,9 @@ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ -o $(perf-tar).tar; \ mkdir -p $(perf-tar); \ git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ -tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ +(cd $(srctree)/tools/perf; \ +util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null); \ +tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \ $(if $(findstring bz2,$@),bzip2, \tools/perf/util/PERF-VERSION-GEN +0
-0
tools/perf/util/PERF-VERSION-GEN if test -d ../../.git -o -f ../../.git · line 27
Quoted 9 lines
tools/perf/util/PERF-VERSION-GEN +3
-0@@ -19,6 +19,9 @@ if test -d ../../.git -o -f ../../.git then TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" +elif test -f ../../PERF-VERSION-FILE +then + TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g') fi if test -z "$TAG" then
Nice!
Thanks,
Ingo
tip-bot for David Ahern
merge bot[tip:perf/core] perf tools: Fix version when building out of tree
In reply to David Ahernperf tools: Fix version when building out of tree
Commit-ID: a614d01bdd0cc8200d917da25f5a3d539b944193 Gitweb: http://git.kernel.org/tip/a614d01bdd0cc8200d917da25f5a3d539b944193 Author: David Ahern <[email protected]> AuthorDate: Wed, 6 Nov 2013 08:55:35 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 7 Nov 2013 10:40:47 -0300
perf tools: Fix version when building out of tree
When building perf out of tree:
$ make perf-tar-src-pkg $ tar -xf perf-<ver>.tar -C /tmp $ cd /tmp/perf<ver> $ make -C tools/perf
you get this warning message:
make[1]: *** No rule to make target `kernelversion'. Stop.
Fix it by saving the perf version in the tar file and using that for the out of tree builds.
v2: removed short form request and fixed up version string from usual output.
--- scripts/package/Makefile | 4 +++- tools/perf/util/PERF-VERSION-GEN | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
scripts/package/Makefile +3 -1
@@ -115,7 +115,9 @@ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ -o $(perf-tar).tar; \ mkdir -p $(perf-tar); \ git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ -tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ +(cd $(srctree)/tools/perf; \ +util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null); \ +tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \ $(if $(findstring bz2,$@),bzip2, \
tools/perf/util/PERF-VERSION-GEN +3 -0
@@ -19,6 +19,9 @@ if test -d ../../.git -o -f ../../.git then TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" +elif test -f ../../PERF-VERSION-FILE +then + TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g') fi if test -z "$TAG" then