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:
parent
aff4522f3d
commit
369f4bd8be
|
@ -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)))
|
TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
|
||||||
|
|
||||||
orig: $(DIR_ORIG)
|
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
|
QUILT_PATCHES='$(CURDIR)/debian/patches' quilt push --quiltrc - -a -q --fuzz=0
|
||||||
|
|
||||||
$(DIR_ORIG):
|
$(DIR_ORIG):
|
||||||
|
@ -64,7 +64,7 @@ endif
|
||||||
|
|
||||||
maintainerclean:
|
maintainerclean:
|
||||||
rm -f debian/config.defines.dump debian/control debian/control.md5sum debian/rules.gen
|
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
|
clean: debian/control
|
||||||
dh_testdir
|
dh_testdir
|
||||||
|
|
|
@ -70,7 +70,7 @@ $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
|
||||||
|
|
||||||
define copy_source
|
define copy_source
|
||||||
mkdir -p '$(1)'
|
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
|
endef
|
||||||
|
|
||||||
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
|
$(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; \
|
set -o pipefail; \
|
||||||
(cd '$(BUILD_DIR)'; \
|
(cd '$(BUILD_DIR)'; \
|
||||||
set +e; \
|
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) | \
|
test $$? -eq 1) | \
|
||||||
filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
|
filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
|
||||||
bzip2 -c >$@ || \
|
bzip2 -c >$@ || \
|
||||||
|
|
Loading…
Reference in New Issue