Respect SOURCE_DATE_EPOCH in cml_version_number

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 951746877bee7ef4a5df6cfc8279073ea4eb6024..87a397d6d6aa7a83839ae2ff7e25c8f2d41610fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ openafs (1.6.20-2) UNRELEASED; urgency=medium
       Linux-4.9-inode_operation-rename-now-takes-flags.patch,
       Linux-4.9-inode_change_ok-becomes-setattr_prepare.patch: Support
       Linux kernel 4.9.  (Closes: #847011)
+    - AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch:
+      Respect SOURCE_DATE_EPOCH in cml_version_number to improve build
+      reproducibility.
 
  -- Anders Kaseorg <andersk@mit.edu>  Thu, 01 Dec 2016 00:13:01 -0500
 

diff --git a/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch b/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch
new file mode 100644 (file)
index 0000000..342a4bc
--- /dev/null
+++ b/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch
@@ -0,0 +1,31 @@
+From 246ac68baddf44731ea402442d99a932e50b5b84 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Sun, 4 Dec 2016 17:26:46 -0500
+Subject: [PATCH] AFS_component_version_number.c: Respect SOURCE_DATE_EPOCH if
+ set
+
+This enables better build reproducibility.
+
+https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal
+
+Change-Id: Id379543a4782a7c1267eaa3d9258751d857cc07b
+---
+ src/config/Makefile.version-NOCML.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in
+index c8ab053c4..83313d26b 100644
+--- a/src/config/Makefile.version-NOCML.in
++++ b/src/config/Makefile.version-NOCML.in
+@@ -11,7 +11,7 @@ AFS_component_version_number.o: AFS_component_version_number.c
+ 
+ AFS_component_version_number.c: @TOP_OBJDIR@/src/config/Makefile.version
+       ( VERSION=`@abs_top_srcdir@/build-tools/git-version @abs_top_srcdir@ "@VERSION@"` && \
+-      echo 'char cml_version_number[]="@(#) OpenAFS '$$VERSION' built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c.NEW && \
++      echo 'char cml_version_number[]="@(#) OpenAFS '$$VERSION' built ' `date +"%Y-%m-%d" $${SOURCE_DATE_EPOCH:+-d "@$$SOURCE_DATE_EPOCH"}` '";' >AFS_component_version_number.c.NEW && \
+       echo 'char* AFSVersion = "${PACKAGE} '$$VERSION'";' >>AFS_component_version_number.c.NEW && \
+       if cmp AFS_component_version_number.c.NEW AFS_component_version_number.c > /dev/null 2>&1 ; then : ; else \
+       mv AFS_component_version_number.c.NEW AFS_component_version_number.c ; fi )
+-- 
+2.11.0
+

diff --git a/debian/patches/series b/debian/patches/series
index 68f207a1166709ba1671ceab34fd03d5ebd9f4a6..ebcfb26f3d8bf91e70544f86c0f0ae19ebe75252 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ afs-shake-harder-in-shake-loose-vcaches.patch
 Linux-4.9-deal-with-demise-of-GROUP_AT.patch
 Linux-4.9-inode_operation-rename-now-takes-flags.patch
 Linux-4.9-inode_change_ok-becomes-setattr_prepare.patch
+AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch