debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Ignore .git directory when copying/comparing source 

This helps people using git-svn checkouts (thanks to Yves-Alexis Perez)

svn path=/dists/sid/linux/; revision=19242
This commit is contained in:
Ben Hutchings 2012-07-09 13:28:07 +00:00
parent aff4522f3d
commit 369f4bd8be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/rules vendored
View File

@ -51,7 +51,7 @@ TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
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)/ .
QUILT_PATCHES='$(CURDIR)/debian/patches' quilt push --quiltrc - -a -q --fuzz=0
$(DIR_ORIG):
@ -64,7 +64,7 @@ endif
maintainerclean:
rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen
rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*))
rm -rf $(filter-out debian .svk .svn .git, $(wildcard * .[^.]*))
clean: debian/control
dh_testdir

4
debian/rules.real vendored
View File

@ -70,7 +70,7 @@ $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
define copy_source
mkdir -p '$(1)'
cp -al $(filter-out debian .pc .svk .svn, $(wildcard * .[^.]*)) '$(1)'
cp -al $(filter-out debian .pc .svk .svn .git, $(wildcard * .[^.]*)) '$(1)'
endef
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
@ -85,7 +85,7 @@ $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.bz2: $(STAMPS_DIR)/source_no
set -o pipefail; \
(cd '$(BUILD_DIR)'; \
set +e; \
diff -urN -p -x debian -x .pc -x .svk -x .svn source_none source_$*; \
diff -urN -p -x debian -x .pc -x .svk -x .svn -x .git source_none source_$*; \
test $$? -eq 1) | \
filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
bzip2 -c >$@ || \