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

[Ben Hutchings]

Author: benh
Date: Mon Jul  6 21:22:54 2015
New Revision: 22804

Log:
linux-source: Sort files in the tarball to make it reproducible

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Jul  6 21:14:54 2015	(r22803)
+++ dists/trunk/linux/debian/changelog	Mon Jul  6 21:22:54 2015	(r22804)
@@ -9,7 +9,7 @@
   * 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-source: Fix timestamps and sort files in the tarball
     - linux-doc: Drop original timestamp (and name) when compressing
   * aufs: Apply patches to enable building aufs out-of-tree
   * [x86] Enable MMIOTRACE (Closes: #790808)

Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real	Mon Jul  6 21:14:54 2015	(r22803)
+++ dists/trunk/linux/debian/rules.real	Mon Jul  6 21:22:54 2015	(r22804)
@@ -89,7 +89,9 @@
 	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)'
+	cd '$(BUILD_DIR)'; find 'linux-source-$(UPSTREAMVERSION)' -print0 | \
+		LC_ALL=C sort -z | \
+		xargs -0 tar --no-recursion -raf 'linux-source-$(UPSTREAMVERSION).tar.xz'
 	rm -rf '$(DIR)'
 
 $(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.xz: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_%