[Glibc-bsd-commits] r5264 - in trunk: kfreebsd-10/debian kfreebsd-11/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-27 13:23:46 +0000 (Fri, 27 Dec 2013)
New Revision: 5264

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Only assert linker.hints presence on kfreebsd-any.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-12-27 13:00:38 UTC (rev 5263)
+++ trunk/kfreebsd-10/debian/changelog	2013-12-27 13:23:46 UTC (rev 5264)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn259778-2) UNRELEASED; urgency=low
+
+  * Only assert linker.hints presence on kfreebsd-any.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 27 Dec 2013 14:23:16 +0100
+
 kfreebsd-10 (10.0~svn259778-1) unstable; urgency=medium
 
   * New upstream snapshot (10.0-RC3).

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-12-27 13:00:38 UTC (rev 5263)
+++ trunk/kfreebsd-10/debian/rules	2013-12-27 13:23:46 UTC (rev 5264)
@@ -252,12 +252,14 @@
 	# fix broken perms in module dir
 	-chmod 644 $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/*
 
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
 	# 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
 
 # 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
+endif
 
 	# remove loader.conf (part of kfreebsd-loader)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-12-27 13:00:38 UTC (rev 5263)
+++ trunk/kfreebsd-11/debian/changelog	2013-12-27 13:23:46 UTC (rev 5264)
@@ -1,3 +1,9 @@
+kfreebsd-11 (11.0~svn259528-3) UNRELEASED; urgency=low
+
+  * Only assert linker.hints presence on kfreebsd-any.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 27 Dec 2013 14:23:10 +0100
+
 kfreebsd-11 (11.0~svn259528-2) experimental; urgency=low
 
   * Drop one more round of srcdir copying.

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2013-12-27 13:00:38 UTC (rev 5263)
+++ trunk/kfreebsd-11/debian/rules	2013-12-27 13:23:46 UTC (rev 5264)
@@ -244,9 +244,11 @@
 		../../boot/modules/$(version)-$(abiname)-$* \
 		$(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
 
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
 	# 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
+endif
 
 	# remove loader.conf (part of kfreebsd-loader)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf