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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-26 00:32:01 +0000 (Thu, 26 Dec 2013)
New Revision: 5260

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Put linker.hints on hold

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-12-25 23:52:35 UTC (rev 5259)
+++ trunk/kfreebsd-10/debian/changelog	2013-12-26 00:32:01 UTC (rev 5260)
@@ -5,7 +5,9 @@
       unstable for 7 days.
 
   [ Robert Millan ]
-  * Build and install linker.hints. (Closes: #684595)
+  * Build linker.hints, but don't install it yet. We need to decide
+    what to do about the regressions (e.g. #732692)
+    (this doesn't fix #684595 yet...)
 
  -- Robert Millan <rmh at debian.org>  Tue, 24 Dec 2013 13:42:34 +0100
 

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-12-25 23:52:35 UTC (rev 5259)
+++ trunk/kfreebsd-10/debian/rules	2013-12-26 00:32:01 UTC (rev 5260)
@@ -256,6 +256,9 @@
 	# it can't find kldxref).
 	test -e $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/linker.hints
 
+# FIXME: We're not ready yet. We need to decide what to do about the regressions (e.g. #732692)
+	rm -f $(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