[Glibc-bsd-commits] r5960 - trunk/kfreebsd-11/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-20 23:11:11 +0000 (Sun, 20 Mar 2016)
New Revision: 5960

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
* Make get-orig-source tarball reproducible
* Replace BUILD_DATE with SOURCE_DATE_EPOCH


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2016-03-20 21:51:24 UTC (rev 5959)
+++ trunk/kfreebsd-11/debian/changelog	2016-03-20 23:11:11 UTC (rev 5960)
@@ -1,6 +1,8 @@
 kfreebsd-11 (11.0~svn295083-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot of -CURRENT
+  * Make get-orig-source tarball reproducible
+  * Replace BUILD_DATE with SOURCE_DATE_EPOCH
   * Disable building the xen (PV, i386-only) flavour, removed upstream,
     as it is preferred now to use the generic kernel in HVM mode.
   * Use new preferred hostname for upstream SVN with HTTPS

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2016-03-20 21:51:24 UTC (rev 5959)
+++ trunk/kfreebsd-11/debian/rules	2016-03-20 23:11:11 UTC (rev 5960)
@@ -42,7 +42,7 @@
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.xz
 PATH		:= /usr/lib/freebsd:$(PATH)
-BUILD_DATE	?= $(shell dpkg-parsechangelog --show-field=Date)
+SOURCE_DATE_EPOCH ?= $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -103,6 +103,10 @@
 		| sed -ne 's/.*\sCLANG_VERSION\s\+//p' \
 		> $(ORIG_DIR)/CLANG_VERSION
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
+	# Clamp timestamps to be no newer than last changelog entry, see
+	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
+	find $(ORIG_DIR) -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 $(ORIG_DIR) -print0 | LC_ALL=C sort -z \
@@ -184,8 +188,8 @@
 	chown -R root.src $(SRC_DIR)
 	# Clamp timestamps to be no newer than last changelog entry, see
 	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
-	find $(SRC_DIR) -newermt "$(BUILD_DATE)" -print0 \
-	 | xargs -0r touch --no-dereference --date="$(BUILD_DATE)"
+	find $(SRC_DIR) -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
 	# and normalised file permissions regardless of umask, see