[Glibc-bsd-commits] r4953 - in trunk/kfreebsd-10/debian: . patches

[Steven Chamberlain]

Author: stevenc-guest
Date: 2013-09-20 22:28:04 +0000 (Fri, 20 Sep 2013)
New Revision: 4953

Added:
   trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-10/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-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-09-20 21:52:05 UTC (rev 4952)
+++ trunk/kfreebsd-10/debian/changelog	2013-09-20 22:28:04 UTC (rev 4953)
@@ -1,11 +1,18 @@
 kfreebsd-10 (10.0~svn255412-2) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * Remove one gratuitous round of src copying.
   * Disable -Werror only for non-Clang compilers.
   * Properly set CLANG_IS_CC knob according to selected compiler.
   * Re-enable -O2.
   * Build kfreebsd-headers-\* only on kfreebsd- at arch@.
 
+  [ 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.
+
  -- Robert Millan <rmh at debian.org>  Sat, 14 Sep 2013 14:34:07 +0200
 
 kfreebsd-10 (10.0~svn255412-1) experimental; urgency=low

Added: trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/923_newvers_timestamp.diff	2013-09-20 22:28:04 UTC (rev 4953)
@@ -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=`dpkg-parsechangelog -l"${SYSDIR}/../../debian/changelog" -S"Date"`
++fi
++
+ for dir in /usr/bin /usr/local/bin; do
+ 	if [ ! -z "${svnversion}" ] ; then
+ 		break

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2013-09-20 21:52:05 UTC (rev 4952)
+++ trunk/kfreebsd-10/debian/patches/series	2013-09-20 22:28:04 UTC (rev 4953)
@@ -28,4 +28,5 @@
 920_linux_cflags.diff
 921_signal_watchdog.diff
 922_cc_version.diff
+923_newvers_timestamp.diff
 999_config.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-09-20 21:52:05 UTC (rev 4952)
+++ trunk/kfreebsd-10/debian/rules	2013-09-20 22:28:04 UTC (rev 4953)
@@ -234,7 +234,7 @@
 	$(MAKE) CC=$(cc_cmd) -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)-$*/*