[Glibc-bsd-commits] r5505 - branches/experimental/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-08-27 21:38:31 +0000 (Wed, 27 Aug 2014)
New Revision: 5505

Modified:
   branches/experimental/kfreebsd-10/debian/changelog
   branches/experimental/kfreebsd-10/debian/rules
Log:
Improve build reproducibility:
use brandelf to give kernel modules the ELF ABI number for FreeBSD, even when building on Linux


Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog	2014-08-27 11:22:23 UTC (rev 5504)
+++ branches/experimental/kfreebsd-10/debian/changelog	2014-08-27 21:38:31 UTC (rev 5505)
@@ -1,6 +1,10 @@
 kfreebsd-10 (10.1~svn270273-3) UNRELEASED; urgency=medium
 
-  * Remove some more build tree paths from the output files
+  * Improve build reproducibility:
+    - remove last remaining occurrences of the full build path from the
+      output files
+    - use brandelf to give kernel modules the ELF ABI number for
+      FreeBSD, even when building on Linux
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 27 Aug 2014 05:13:07 +0100
 

Modified: branches/experimental/kfreebsd-10/debian/rules
===================================================================
--- branches/experimental/kfreebsd-10/debian/rules	2014-08-27 11:22:23 UTC (rev 5504)
+++ branches/experimental/kfreebsd-10/debian/rules	2014-08-27 21:38:31 UTC (rev 5505)
@@ -266,7 +266,10 @@
 	$(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)-$*
-	# Brand kernel image as FreeBSD type, in case not building on kfreebsd
+	# Brand kernel image and modules as FreeBSD type, in case not building
+        # on kfreebsd
+	find $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/ \
+	 -name '*.ko' -exec brandelf -t FreeBSD \{\} \;
 	brandelf -t FreeBSD $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 	gzip -9 -n $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*