From de51e155f3757ec2dd0b8f51ec7e7b5d9dff000b Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Thu, 19 Feb 2015 19:56:23 -0500 Subject: [PATCH] debian: Add extend-diff-ignore options to debian packager This will ignore excluded deb, rpm, pkg and .git directories that were tar'ed for the .orig.tar.gz debian upstream package file and will prevent build errors --- Makefile.builder | 2 +- debian/source/options | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 debian/source/options diff --git a/Makefile.builder b/Makefile.builder index 17416a5..5766587 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -15,6 +15,6 @@ source-debian-quilt-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version) source-debian-quilt-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/../qubes-core-agent_$(VERSION).orig.tar.gz" source-debian-quilt-copy-in: -$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches) - tar cvfz $(ORIG_FILE) --exclude-vcs --exclude=deb --exclude=rpm --exclude=pkgs --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) . + tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) . # vim: filetype=make diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..27a571b --- /dev/null +++ b/debian/source/options @@ -0,0 +1,4 @@ +extend-diff-ignore = "(^|/)(.git/.*)$" +extend-diff-ignore = "(^|/)(deb/.*)$" +extend-diff-ignore = "(^|/)(pkgs/.*)$" +extend-diff-ignore = "(^|/)(rpm/.*)$"