[Glibc-bsd-commits] r4947 - in trunk/kfreebsd-9/debian: . patches

[Steven Chamberlain]

Author: stevenc-guest
Date: 2013-09-19 21:04:43 +0000 (Thu, 19 Sep 2013)
New Revision: 4947

Added:
   trunk/kfreebsd-9/debian/patches/923_newvers_timestamp.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
   trunk/kfreebsd-9/debian/rules
Log:
Improve repeatability of builds:
- Omit gzip timestamp from kernel image.
- Use timestamp from debian/changelog for uname --kernel-release,
  instead of the exact time of the build.


Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2013-09-18 10:21:03 UTC (rev 4946)
+++ trunk/kfreebsd-9/debian/changelog	2013-09-19 21:04:43 UTC (rev 4947)
@@ -1,3 +1,13 @@
+kfreebsd-9 (9.2~svn255465-2) UNRELEASED; urgency=low
+
+  [ Steven Chamberlain ]
+  * Improve repeatability of builds:
+    - Omit gzip timestamp from kernel image.
+    - Use timestamp from debian/changelog for uname --kernel-release,
+      instead of the exact time of the build.
+
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Thu, 19 Sep 2013 20:37:41 +0100
+
 kfreebsd-9 (9.2~svn255465-1) unstable; urgency=high
 
   * New upstream release (9.2-RC4).

Added: trunk/kfreebsd-9/debian/patches/923_newvers_timestamp.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/923_newvers_timestamp.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/923_newvers_timestamp.diff	2013-09-19 21:04:43 UTC (rev 4947)
@@ -0,0 +1,24 @@
+Description: Use timestamp from debian/changelog
+  Use timestamp from the most recent debian/changelog entry,
+  instead of the exact time of the build.
+  .
+  This helps to make builds repeatable and the output more easily
+  comparable.
+Forwarded: not-needed
+Author: Steven Chamberlain <steven at pyro.eu.org>
+
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -88,6 +88,12 @@
+ i=`${MAKE:-make} -V KERN_IDENT`
+ compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
+ 
++if [ -f "${SYSDIR}/../../debian/changelog" ] ; then
++	# Use timestamp from the most recent debian/changelog entry,
++	# instead of the exact time of the build.
++	t=`grep -a '^ --' "${SYSDIR}/../../debian/changelog" | head -n 1 | sed 's/^.*\s\s\(...,.\+\)$/\1/'`
++fi
++
+ for dir in /bin /usr/bin /usr/local/bin; do
+ 	if [ -x "${dir}/svnversion" ] ; then
+ 		svnversion=${dir}/svnversion

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2013-09-18 10:21:03 UTC (rev 4946)
+++ trunk/kfreebsd-9/debian/patches/series	2013-09-19 21:04:43 UTC (rev 4947)
@@ -33,5 +33,6 @@
 918_unix_socket_overflow.diff
 919_delete_key.diff
 922_cc_version.diff
+923_newvers_timestamp.diff
 950_no_stack_protector.diff
 999_config.diff

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2013-09-18 10:21:03 UTC (rev 4946)
+++ trunk/kfreebsd-9/debian/rules	2013-09-19 21:04:43 UTC (rev 4947)
@@ -248,7 +248,7 @@
 	$(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
 	mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 	chmod 644 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
-	gzip -9 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+	gzip -9 -n $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 
 	# fix broken perms in module dir
 	-chmod 644 $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/*