summaryrefslogtreecommitdiffstats
path: root/scripts/package
diff options
context:
space:
mode:
authormatt mooney <mfm@muteddisk.com>2011-05-13 16:41:12 -0700
committerMichal Marek <mmarek@suse.cz>2011-06-24 15:20:55 +0200
commit3bdccc880b39c2d8e2cdd3783107dc6799ba62ca (patch)
tree1fa83bcce272227df9c009498878f733f55a748c /scripts/package
parent55922c9d1b84b89cb946c777fddccb3247e7df2c (diff)
downloadlinux-stable-3bdccc880b39c2d8e2cdd3783107dc6799ba62ca.tar.gz
linux-stable-3bdccc880b39c2d8e2cdd3783107dc6799ba62ca.tar.bz2
linux-stable-3bdccc880b39c2d8e2cdd3783107dc6799ba62ca.zip
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/package')
-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)
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,$@),, \