perf tools: Fix version when building out of tree (a614d01b) · Commits · 戴 / test

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. Signed-off-by:

David Ahern <dsahern@gmail.com> Suggested-by:

Ingo Molnar <mingo@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/1383753335-25782-1-git-send-email-dsahern@gmail.com Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

scripts/package/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Admin message