[Glibc-bsd-commits] r5891 - trunk/freebsd-libs/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 01:24:19 +0000 (Sat, 05 Mar 2016)
New Revision: 5891

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
* Make get-orig-source tarball reproducible
* Change source tarball compression algorithm to XZ


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-03-05 01:21:32 UTC (rev 5890)
+++ trunk/freebsd-libs/debian/changelog	2016-03-05 01:24:19 UTC (rev 5891)
@@ -3,6 +3,8 @@
   * New upstream snapshot of 10.3-RC1
   * Actually use the proper build architecture compiler
     (thanks, Helmut Grohne!)
+  * Make get-orig-source tarball reproducible
+  * Change source tarball compression algorithm to XZ
   * Add myself to Uploaders
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 05 Mar 2016 01:12:41 +0000

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2016-03-05 01:21:32 UTC (rev 5890)
+++ trunk/freebsd-libs/debian/rules	2016-03-05 01:24:19 UTC (rev 5891)
@@ -47,7 +47,7 @@
 #SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
 #SVN		:= https://svn0.us-west.freebsd.org/base/head
 ORIGDIR = $(SOURCE)-$(tar_version)
-TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.xz
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
@@ -97,7 +97,16 @@
 	# Remove all CAM kernel headers to ensure system-wide version is used instead
 	find $(ORIGDIR)/sys/cam -name \*.h | xargs rm -f
 
-	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
+	# Clamp timestamps to be no newer than last changelog entry, see
+	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
+	find $(ORIGDIR) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 \
+	 | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
+	# Create tarball with files sorted in a stable order, see
+	# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs
+	find $(ORIGDIR) -print0 | LC_ALL=C sort -z \
+	 | tar --null --no-recursion --files-from - \
+	    --numeric-owner --owner 0 --group 0 \
+	    -cJf ../$(TARNAME)
 	rm -rf $(ORIGDIR)
 
 BUILD_ARCH_TARGETS = \