[linux] 02/02: debian/rules.real: Exclude *.pyc from featureset diffs

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch jessie-backports
in repository linux.

commit 62cce57936757e7492b082b2845e04be00cda5d2
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Dec 14 15:46:02 2016 +0000

    debian/rules.real: Exclude *.pyc from featureset diffs
    
    Since jessie's diff returns 2 when it finds a binary (#737180) we need
    to do this to avoid FTBFS.  Besides which, those aren't part of the
    source.
---
 debian/changelog  | 2 ++
 debian/rules.real | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1e1cfb6..c61e7cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ linux (4.8.11-1~bpo8+1) UNRELEASED; urgency=medium
       jessie-backports.
     - linux-image-dbg: Revert changes to packaging of debug symbols, as new-
       style dbgsym packages are not properly supported in jessie-backports
+  * debian/rules.real: Exclude *.pyc from featureset diffs (fixes FTBFS due
+    to #737180)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 14 Dec 2016 04:24:54 +0000
 
diff --git a/debian/rules.real b/debian/rules.real
index ac1b99e..24996a0 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -122,7 +122,7 @@ $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.xz: $(STAMPS_DIR)/source_non
 	set -o pipefail;						\
 	(cd '$(BUILD_DIR)';						\
 	 set +e;							\
-         diff -urN -p -x debian -x .pc -x .svk -x .svn -x .git source_none source_$*; \
+         diff -urN -p -x debian -x .pc -x .svk -x .svn -x .git -x '*.pyc' source_none source_$*; \
 	 test $$? -eq 1) |						\
 	filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \
 	xz -c >$@ ||							\

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