[kernel] r22649 - dists/trunk/linux/debian

[Ben Hutchings]

Author: benh
Date: Tue May 12 19:11:55 2015
New Revision: 22649

Log:
Apply more timestamp fixes from Jérémy Bobbio in #769844

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/rules.real

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue May 12 19:05:41 2015	(r22648)
+++ dists/trunk/linux/debian/changelog	Tue May 12 19:11:55 2015	(r22649)
@@ -3,8 +3,11 @@
   * New upstream release candidate
 
   [ Ben Hutchings ]
-  * linux-image: Fix timestamps in the built-in initramfs for reproducible
-    build
+  * Fix some embedded timestamps that prevent a reproducible build
+    (thanks to Jérémy Bobbio):
+    - linux-image: Fix timestamps in the built-in initramfs
+    - linux-source: Fix timestamps in the tarball
+    - linux-doc: Drop original timestamp (and name) when compressing
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 11 May 2015 16:19:42 +0100
 

Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real	Tue May 12 19:05:41 2015	(r22648)
+++ dists/trunk/linux/debian/rules.real	Tue May 12 19:11:55 2015	(r22649)
@@ -87,6 +87,8 @@
 	rm -rf '$@' '$(DIR)'
 	$(call copy_source,$(DIR))
 	chmod -R u+rw,go=rX '$(DIR)'
+	find '$(DIR)' -depth -newermt '$(SOURCE_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(SOURCE_DATE)'
 	cd '$(BUILD_DIR)'; tar -caf 'linux-source-$(UPSTREAMVERSION).tar.xz' 'linux-source-$(UPSTREAMVERSION)'
 	rm -rf '$(DIR)'
 
@@ -202,7 +204,7 @@
 	cd $(DIR)/Documentation/DocBook; \
 	find * -name '*.html' -print | \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html'
-	gzip -9qfr $(OUT_DIR)/Documentation
+	gzip -9nqfr $(OUT_DIR)/Documentation
 	+$(MAKE_SELF) install-base
 
 install-manual: PACKAGE_NAME = linux-manual-$(VERSION)