From patchwork Thu May 12 18:25:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: matt mooney X-Patchwork-Id: 780662 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4CIPuTf014613 for ; Thu, 12 May 2011 18:25:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758415Ab1ELSZz (ORCPT ); Thu, 12 May 2011 14:25:55 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:42480 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758325Ab1ELSZy (ORCPT ); Thu, 12 May 2011 14:25:54 -0400 Received: by pzk9 with SMTP id 9so829911pzk.19 for ; Thu, 12 May 2011 11:25:53 -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; bh=YAYcyFIqO5hstSibHCCL83dAK1U60fRE0D+WvH0vryE=; b=fCmmQgeqlDPWDsSlDsmX75qH+ztQ2+1Tf0WepyOdeQR7K5Ktyr8FHiKIFF91jNI19M QgOqsCMQocntQ/AnVPYOJ3MCYCz8hNLrU+hm2vPPZKGPqo90l5S92lRsyu78DlSUzFLq SXkG/HqWQWW391Yq27JM4a6ZAoYOO1hacI2Ug= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=hiikfTBZod3aH+uVXEsCPRzmO+9S2NciHTjQI6Qbs7iEuAVekxV3GGN2i+s7VTqxUB XWbpPO4liR5GIFlC1epNrGoUXc5uJHNhDOCbKxRyhFaOFdODlqYAeoo7jNd1aeGysiou LxkdI9otlqNg8u5GjHrXMHHah7xglidVWQhEE= Received: by 10.68.40.135 with SMTP id x7mr696277pbk.132.1305224753741; Thu, 12 May 2011 11:25:53 -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 p1sm818253pbi.26.2011.05.12.11.25.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 May 2011 11:25:51 -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: [Resend PATCH] package: Makefile: fix perf target bug Date: Thu, 12 May 2011 11:25:15 -0700 Message-Id: <1d7d3b31c0da82ce8ce75778922155b7004a8f7e.1305224477.git.mfm@muteddisk.com> X-Mailer: git-send-email 1.7.5.1 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, 12 May 2011 18:25:56 +0000 (UTC) From: matt mooney Specify --git-dir and --work-tree when building perf targets to allow out-of-tree builds using O=. The cat command had to be changed to allow proper file name expansion of the files listed in MANIFEST. Signed-off-by: matt mooney --- Hi Michal, Sorry if you have already received this, but there seems to have been a problem when it was first sent. Thanks, matt scripts/package/Makefile | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 1b7eaea..a32dc2d 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -118,10 +118,14 @@ 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 --work-tree=$(srctree) \ + archive --prefix=$(perf-tar)/ HEAD^{tree} \ + $(addprefix $(srctree)/, \ + $(shell 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 --work-tree=$(srctree) \ + rev-parse HEAD > $(perf-tar)/HEAD; \ tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \