aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authormatt mooney <mfm@muteddisk.com>2011-05-13 19:41:12 -0400
committerMichal Marek <mmarek@suse.cz>2011-06-24 09:20:55 -0400
commit3bdccc880b39c2d8e2cdd3783107dc6799ba62ca (patch)
tree1fa83bcce272227df9c009498878f733f55a748c /scripts
parent55922c9d1b84b89cb946c777fddccb3247e7df2c (diff)
package: Makefile: fix perf target bug
Specify --git-dir when building perf targets to allow out-of-tree builds using O=<build-dir>. 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 <mfm@muteddisk.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 006960ebbce9..bc6aa003860e 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -118,10 +118,12 @@ perf-tar=perf-$(KERNELVERSION)
118 118
119quiet_cmd_perf_tar = TAR 119quiet_cmd_perf_tar = TAR
120 cmd_perf_tar = \ 120 cmd_perf_tar = \
121git archive --prefix=$(perf-tar)/ HEAD^{tree} \ 121git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \
122 $$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar; \ 122 HEAD^{tree} $$(cd $(srctree); \
123 echo $$(cat $(srctree)/tools/perf/MANIFEST)) \
124 -o $(perf-tar).tar; \
123mkdir -p $(perf-tar); \ 125mkdir -p $(perf-tar); \
124git rev-parse HEAD > $(perf-tar)/HEAD; \ 126git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \
125tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ 127tar rf $(perf-tar).tar $(perf-tar)/HEAD; \
126rm -r $(perf-tar); \ 128rm -r $(perf-tar); \
127$(if $(findstring tar-src,$@),, \ 129$(if $(findstring tar-src,$@),, \