From d03b9879f9543323b7a84b0a0039d6385a38db44 Mon Sep 17 00:00:00 2001 From: Greg Dietsche Date: Thu, 30 Jun 2011 18:42:50 -0500 Subject: [PATCH] --- yaml --- r: 258916 b: refs/heads/master c: b756828609ee8cb1320effc371cfafde6a6246fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/.gitignore | 5 +++++ trunk/scripts/package/Makefile | 8 +++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 34d36729a839..e23c22584eae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bdccc880b39c2d8e2cdd3783107dc6799ba62ca +refs/heads/master: b756828609ee8cb1320effc371cfafde6a6246fe diff --git a/trunk/.gitignore b/trunk/.gitignore index 9dacde0a4b2d..57af07cf7e68 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -45,6 +45,11 @@ modules.builtin /Module.markers /Module.symvers +# +# Debian directory (make deb-pkg) +# +/debian/ + # # git files that we don't want to ignore even it they are dot-files # diff --git a/trunk/scripts/package/Makefile b/trunk/scripts/package/Makefile index bc6aa003860e..006960ebbce9 100644 --- a/trunk/scripts/package/Makefile +++ b/trunk/scripts/package/Makefile @@ -118,12 +118,10 @@ perf-tar=perf-$(KERNELVERSION) 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)) \ - -o $(perf-tar).tar; \ +git archive --prefix=$(perf-tar)/ HEAD^{tree} \ + $$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar; \ mkdir -p $(perf-tar); \ -git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD; \ +git rev-parse HEAD > $(perf-tar)/HEAD; \ tar rf $(perf-tar).tar $(perf-tar)/HEAD; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \