[linux] 01/08: Ignore .git directory when copying/comparing source

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch squeeze-security
in repository linux.

commit 801897ea93a18d6e26b551f06268b286efaa77a3
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 22 21:13:54 2015 +0200

    Ignore .git directory when copying/comparing source
    
    This helps people using git-svn checkouts (thanks to Yves-Alexis Perez)
    
    (cherry picked from commit 369f4bd8be6a25a01792c48e62eec9c0e7070178)
    
    For linux-2.6, adjust context and fix the rather different source
    copy command in debian/rules.real.
---
 debian/rules      | 4 ++--
 debian/rules.real | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2c64da3..06dc5b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.gz
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
 
 orig: $(DIR_ORIG)
-	rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+	rsync --delete --exclude debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
 
 $(DIR_ORIG):
 ifeq ($(TAR_ORIG),)
@@ -52,7 +52,7 @@ endif
 
 maintainerclean:
 	rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen debian/bin/patch.*
-	rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*))
+	rm -rf $(filter-out debian .svk .svn .git, $(wildcard * .[^.]*))
 
 clean: debian/control
 	dh_testdir
diff --git a/debian/rules.real b/debian/rules.real
index aaf7ab4..9ebd798 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -82,7 +82,7 @@ define patch_cmd
 cd '$(DIR)'; python '$(CURDIR)/debian/bin/patch.apply' --overwrite-home='$(CURDIR)/debian/patches'
 endef
 
-$(STAMPS_DIR)/source: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
+$(STAMPS_DIR)/source: SOURCE_FILES = $(filter-out debian .git, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/source: DIR = $(BUILD_DIR)/source
 $(STAMPS_DIR)/source:
 	rm -rf '$(DIR)'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git