atom feed15 messages in org.kernel.vger.kernel-janitors[PATCH v2] package: Makefile: fix per...
FromSent OnAttachments
mfmo...@gmail.comMay 12, 2011 11:25 am 
Michal MarekMay 12, 2011 1:30 pm 
matt mooneyMay 12, 2011 2:07 pm 
Michal MarekMay 12, 2011 2:19 pm 
matt mooneyMay 12, 2011 2:38 pm 
mfmo...@gmail.comMay 12, 2011 5:09 pm 
Michal MarekMay 13, 2011 1:26 am 
matt mooneyMay 13, 2011 11:52 am 
Michal MarekMay 13, 2011 12:56 pm 
matt mooneyMay 13, 2011 4:26 pm 
mfmo...@gmail.comMay 13, 2011 4:41 pm 
Arnaldo Carvalho de MeloMay 15, 2011 8:39 am 
Michal MarekMay 16, 2011 1:19 am 
matt mooneyJun 12, 2011 11:19 am 
Michal MarekJun 24, 2011 6:21 am 
Subject:[PATCH v2] package: Makefile: fix perf target bug
From:mfmo...@gmail.com (mfmo@gmail.com)
Date:May 12, 2011 5:09:03 pm
List:org.kernel.vger.kernel-janitors

From: matt mooney <mf@muteddisk.com>

Specify --git-dir and --work-tree when building perf targets to allow out-of-tree builds using O=<build-dir>.

The cat command had to be changed to allow proper file name expansion of the files listed in MANIFEST.

Signed-off-by: matt mooney <mf@muteddisk.com>

--- Okay, so I decided to just go ahead and send this. It removes the --work-tree option from the git rev-parse command. I did test it the way you said, without --work-tree on either statement, but the git archive command fails in that case.

Thanks, matt

scripts/package/Makefile | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 1b7eaea..2747f1f 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -118,10 +118,13 @@ 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 rev-parse HEAD > $(perf-tar)/HEAD; \ tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \