From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755027Ab3KFPzm (ORCPT ); Wed, 6 Nov 2013 10:55:42 -0500 Received: from mail-pb0-f48.google.com ([209.85.160.48]:61234 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720Ab3KFPzl (ORCPT ); Wed, 6 Nov 2013 10:55:41 -0500 From: David Ahern To: acme@ghostprotocols.net, linux-kernel@vger.kernel.org Cc: David Ahern , Ingo Molnar , Namhyung Kim , Jiri Olsa Subject: [PATCH] perf: Fix version when building out of tree - v2 Date: Wed, 6 Nov 2013 08:55:35 -0700 Message-Id: <1383753335-25782-1-git-send-email-dsahern@gmail.com> X-Mailer: git-send-email 1.8.3.4 (Apple Git-47) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building perf out of tree make perf-tar-src-pkg tar -xf perf-.tar -C /tmp cd /tmp/perf 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 Suggested-by: Ingo Molnar Signed-off-by: David Ahern Cc: Ingo Molnar Cc: Namhyung Kim Cc: Jiri Olsa --- scripts/package/Makefile | 4 +++- tools/perf/util/PERF-VERSION-GEN | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/package/Makefile b/scripts/package/Makefile index a4f31c900fa6..c5d473393816 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -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, \ diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 15a77b7c0e36..00d88be4e50c 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -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 -- 1.8.3.4 (Apple Git-47)