[Glibc-bsd-commits] r4879 - in trunk/kfreebsd-9/debian: . arch/amd64 arch/i386 patches

[Robert Millan]

Author: rmh
Date: 2013-08-06 21:01:12 +0000 (Tue, 06 Aug 2013)
New Revision: 4879

Modified:
   trunk/kfreebsd-9/debian/arch/amd64/amd64.config
   trunk/kfreebsd-9/debian/arch/i386/486.config
   trunk/kfreebsd-9/debian/arch/i386/686.config
   trunk/kfreebsd-9/debian/arch/i386/xen.config
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/999_config.diff
Log:
Move GENERIC.hints to arch-specific config.

Modified: trunk/kfreebsd-9/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2013-08-06 20:43:26 UTC (rev 4878)
+++ trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2013-08-06 21:01:12 UTC (rev 4879)
@@ -27,5 +27,8 @@
 device		pfsync
 device		pflog
 
+# Default places to look for devices.
+hints          "GENERIC.hints"
+
 include         GENERIC
 include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/486.config	2013-08-06 20:43:26 UTC (rev 4878)
+++ trunk/kfreebsd-9/debian/arch/i386/486.config	2013-08-06 21:01:12 UTC (rev 4879)
@@ -29,6 +29,8 @@
 device		xboxfb
 device		fb
 
+# Default places to look for devices.
+hints          "GENERIC.hints"
 
 include		GENERIC
 include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/686.config	2013-08-06 20:43:26 UTC (rev 4878)
+++ trunk/kfreebsd-9/debian/arch/i386/686.config	2013-08-06 21:01:12 UTC (rev 4879)
@@ -30,6 +30,8 @@
 device		xboxfb
 device		fb
 
+# Default places to look for devices.
+hints          "GENERIC.hints"
 
 include		GENERIC
 include		DEBIAN

Modified: trunk/kfreebsd-9/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/xen.config	2013-08-06 20:43:26 UTC (rev 4878)
+++ trunk/kfreebsd-9/debian/arch/i386/xen.config	2013-08-06 21:01:12 UTC (rev 4879)
@@ -28,6 +28,9 @@
 options		TMPFS
 options         QUOTA
 
+# Default places to look for devices.
+hints          "GENERIC.hints"
+
 # raise shared memory limits
 options         SHMMAXPGS=4096
 options         SHMSEG=256

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2013-08-06 20:43:26 UTC (rev 4878)
+++ trunk/kfreebsd-9/debian/changelog	2013-08-06 21:01:12 UTC (rev 4879)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.2~svn253698-3) UNRELEASED; urgency=low
+
+  * Move GENERIC.hints to arch-specific config.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 06 Aug 2013 23:01:03 +0200
+
 kfreebsd-9 (9.2~svn253698-2) unstable; urgency=low
 
   * Reupload to unstable.

Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff	2013-08-06 20:43:26 UTC (rev 4878)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff	2013-08-06 21:01:12 UTC (rev 4879)
@@ -275,15 +275,13 @@
  device		uark		# Technologies ARK3116 based serial adapters
 --- /dev/null
 +++ b/sys/conf/DEBIAN
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,13 @@
 +
 +# Not available yet
 +nomakeoptions	WITH_CTF
 +
 +include		WITHOUT_SOURCELESS
 +
-+hints          "GENERIC.hints"         # Default places to look for devices.
-+
 +# Alternate queueing
 +options		ALTQ
 +options		ALTQ_CBQ	# Class Bases Queuing (CBQ)