[linux] 01/02: Set LC_ALL=C.UTF-8 for all builds

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Fri Aug 21 22:50:07 UTC 2015


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

benh pushed a commit to branch master
in repository linux.

commit b60f5c4de148d3cf15128e23136aaddfdeba5dab
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Aug 21 17:10:10 2015 +0200

    Set LC_ALL=C.UTF-8 for all builds
    
    Upstream sets LC_ALL=C when building most things, and we do that in
    one place to ensure consistent ordering.  However the encoding of HTML
    docs still differs.  Choose 'C.UTF-8' instead of 'C' because it makes
    the HTML docs slightly smaller.
---
 debian/changelog  | 2 ++
 debian/rules.real | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8cd4d5f..66972c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ linux (4.2~rc7-1~exp1) UNRELEASED; urgency=medium
 
   [ Ben Hutchings ]
   * debian/control: Correct build-dependency on xz-utils, needed on all arches
+  * Fix more issues that prevent a reproducible build:
+    - Set LC_ALL=C.UTF-8
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 17 Aug 2015 10:28:46 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 6f90f75..df6f87d 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -33,6 +33,7 @@ endif
 export PYTHONPATH = $(CURDIR)/debian/lib/python
 export DH_OPTIONS
 export DEB_HOST_ARCH DEB_HOST_GNU_TYPE DEB_BUILD_ARCH
+export LC_ALL = C.UTF-8
 
 include debian/rules.defs
 
@@ -90,7 +91,7 @@ $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.xz: $(STAMPS_DIR)/source
 	find '$(DIR)' -depth -newermt '$(SOURCE_DATE)' -print0 | \
 		xargs -0r touch --no-dereference --date='$(SOURCE_DATE)'
 	cd '$(BUILD_DIR)'; find 'linux-source-$(UPSTREAMVERSION)' -print0 | \
-		LC_ALL=C sort -z | \
+		sort -z | \
 		xargs -0 tar --no-recursion -raf 'linux-source-$(UPSTREAMVERSION).tar.xz'
 	rm -rf '$(DIR)'
 

-- 
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