From patchwork Fri May 13 23:41:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: matt mooney X-Patchwork-Id: 784562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4DNfeI5021575 for ; Fri, 13 May 2011 23:41:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758729Ab1EMXl1 (ORCPT ); Fri, 13 May 2011 19:41:27 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:34343 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758402Ab1EMXl0 (ORCPT ); Fri, 13 May 2011 19:41:26 -0400 Received: by pwi15 with SMTP id 15so1373325pwi.19 for ; Fri, 13 May 2011 16:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to; bh=vunYsQIaZBki4qm+CcMWpch107ahUFs2Nd6NljmtpIk=; b=NMS5Vm3ileaescBZ2im0ZdHlERVqNa9d/WnHINiiJ4TWUwxDFEiM+ggZwHywmmQA+G oN6c8MuRKQOj43rzCzLHNWSb8f+vFaNL8Cs4oFDW/arARVzELq+UTCRrdDQKCaYbHRKG SE7iUxsTR6fnyRUpWr5iQQrYw1+xmabIJg5TI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to; b=gGpEE0g3akNdt7GFD1Jk/Med1ew7/gJcFjod6qpDgHjJXjrs/EG2dFd0Gfk7GTWy2u jf0Vb97F68aOXc3N3C+Q2kp1noXiQpWNaA5TD8SMtwSCSf+LSDAHBmUD5jwIP3i3oA50 MU3/wsyIATAN3aqJ3Hzw+vdhjY4IrBfA+Hna0= Received: by 10.68.66.138 with SMTP id f10mr3076746pbt.489.1305330085748; Fri, 13 May 2011 16:41:25 -0700 (PDT) Received: from localhost.localdomain (c-76-126-237-146.hsd1.ca.comcast.net [76.126.237.146]) by mx.google.com with ESMTPS id t9sm1650369pbq.31.2011.05.13.16.41.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 May 2011 16:41:24 -0700 (PDT) From: mfmooney@gmail.com To: Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH v3] package: Makefile: fix perf target bug Date: Fri, 13 May 2011 16:41:12 -0700 Message-Id: X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <4DCD8CE4.4090404@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 (demeter1.kernel.org [140.211.167.41]); Fri, 13 May 2011 23:41:40 +0000 (UTC) From: matt mooney Specify --git-dir when building perf targets to allow out-of-tree builds using O=. The shell command in `git archive' had to be modified to allow proper file name expansion of the files listed in MANIFEST. Signed-off-by: matt mooney Reviewed-by: Michal Marek --- scripts/package/Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 1b7eaea..03df8ee 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -118,10 +118,12 @@ perf-tar=perf-$(KERNELVERSION) quiet_cmd_perf_tar = TAR cmd_perf_tar = \ -git archive --prefix=$(perf-tar)/ HEAD^{tree} \ - $$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar; \ +git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ + HEAD^{tree} $$(cd $(srctree); \ + echo $$(cat $(srctree)/tools/perf/MANIFEST)) \ + -o $(perf-tar).tar; \ mkdir -p $(perf-tar); \ -git rev-parse HEAD > $(perf-tar)/HEAD; \ +git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \