[Glibc-bsd-commits] r5243 - trunk/kfreebsd-10/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-17 23:13:41 +0000 (Tue, 17 Dec 2013)
New Revision: 5243

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.in
   trunk/kfreebsd-10/debian/rules
Log:
Build and install linker.hints. (Closes: #684595)

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-12-17 22:40:54 UTC (rev 5242)
+++ trunk/kfreebsd-10/debian/changelog	2013-12-17 23:13:41 UTC (rev 5243)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn259404-2) UNRELEASED; urgency=low
+
+  * Build and install linker.hints. (Closes: #684595)
+
+ -- Robert Millan <rmh at debian.org>  Tue, 17 Dec 2013 22:43:36 +0100
+
 kfreebsd-10 (10.0~svn259404-1) unstable; urgency=low
 
   * New upstream snapshot (10.0-RC2).

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2013-12-17 22:40:54 UTC (rev 5242)
+++ trunk/kfreebsd-10/debian/control.in	2013-12-17 23:13:41 UTC (rev 5243)
@@ -6,7 +6,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 10~svn253832),
+ freebsd-buildutils (>= 10.0~svn259404-1),
  freebsd-glue (>= 0.1.5),
  byacc,
  @cc_pkg@, libdb-dev,

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-12-17 22:40:54 UTC (rev 5242)
+++ trunk/kfreebsd-10/debian/rules	2013-12-17 23:13:41 UTC (rev 5243)
@@ -252,6 +252,10 @@
 	# fix broken perms in module dir
 	-chmod 644 $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/*
 
+	# Assert linker.hints presence (upstream build system silently skips it when
+	# it can't find kldxref).
+	test -e $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/linker.hints
+
 	# remove loader.conf (part of kfreebsd-loader)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
 	rm -rf $(IMAGE_PACKAGE)-$*/boot/defaults