[linux] 01/01: debian/rules.real: Exclude *.pyc from featureset diffs
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Wed Dec 14 23:05:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit 9bf892f44661a3bd1d6cdaf7d2f166bac67bc776
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 in jessie-backports. Besides which, those
aren't part of the source.
(cherry picked from commit 62cce57936757e7492b082b2845e04be00cda5d2)
---
debian/changelog | 1 +
debian/rules.real | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 73d4eaa..14d85ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -136,6 +136,7 @@ linux (4.8.14-1) UNRELEASED; urgency=medium
[ Ben Hutchings ]
* [amd64] Re-enable LEGACY_VSYSCALL_EMULATE instead of LEGACY_VSYSCALL_NONE.
There are still binaries in stable that use vsyscall (via dietlibc).
+ * debian/rules.real: Exclude *.pyc from featureset diffs
-- Uwe Kleine-König <ukleinek at debian.org> Sun, 04 Dec 2016 21:16:06 +0100
diff --git a/debian/rules.real b/debian/rules.real
index 418d7db..2c0a6df 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
More information about the Kernel-svn-changes
mailing list