diff options
| author | Michal Marek <mmarek@suse.com> | 2015-11-24 17:50:26 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2015-11-24 17:50:26 +0100 |
| commit | 5bced7a1834aabf4ad348bbf59404ff45fdf569b (patch) | |
| tree | 7125317d3ced84370b49f2235690cd5133e6605b /scripts | |
| parent | d023d4d774f71597448805f2f5d30b632d5139be (diff) | |
| parent | 4b63f603135022ca048524cd16f1c6a76a3f169d (diff) | |
| download | linux-next-5bced7a1834aabf4ad348bbf59404ff45fdf569b.tar.gz | |
Merge branch 'kbuild/misc' into kbuild/for-next
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/package/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 1aca224e8597..c2c7389bfbab 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -118,12 +118,12 @@ quiet_cmd_perf_tar = TAR cmd_perf_tar = \ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/ \ HEAD^{tree} $$(cd $(srctree); \ - echo $$(cat $(srctree)/tools/perf/MANIFEST)) \ + echo $$(cat tools/perf/MANIFEST)) \ -o $(perf-tar).tar; \ mkdir -p $(perf-tar); \ git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ (cd $(srctree)/tools/perf; \ -util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null); \ +util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/); \ tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \ |