From patchwork Thu Jun 9 14:57:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 865822 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p59Ew8tR002730 for ; Thu, 9 Jun 2011 14:58:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753221Ab1FIO5l (ORCPT ); Thu, 9 Jun 2011 10:57:41 -0400 Received: from cantor.suse.de ([195.135.220.2]:46967 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753169Ab1FIO5k (ORCPT ); Thu, 9 Jun 2011 10:57:40 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 39FF394109; Thu, 9 Jun 2011 16:57:39 +0200 (CEST) Received: by sepie.suse.cz (Postfix, from userid 10020) id 7066D7655B; Thu, 9 Jun 2011 16:57:38 +0200 (CEST) From: Michal Marek To: Linus Torvalds Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo Subject: [PATCH v2 5/5] perf: Use make kernelversion instead of parsing the Makefile Date: Thu, 9 Jun 2011 16:57:28 +0200 Message-Id: <1307631448-29848-6-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.7.4.2 In-Reply-To: <1307631448-29848-1-git-send-email-mmarek@suse.cz> References: <1307631448-29848-1-git-send-email-mmarek@suse.cz> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 09 Jun 2011 14:58:08 +0000 (UTC) Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Signed-off-by: Michal Marek --- tools/perf/util/PERF-VERSION-GEN | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 26d4d3f..9c5fb4d 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -23,12 +23,7 @@ if test -d ../../.git -o -f ../../.git && then VN=$(echo "$VN" | sed -e 's/-/./g'); else - eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ') - eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ') - eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ') - eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ') - - VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}" + VN=$(make -sC ../.. kernelversion) fi VN=$(expr "$VN" : v*'\(.*\)')