[Glibc-bsd-commits] r4866 - in trunk/kfreebsd-10/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-08-04 20:53:14 +0000 (Sun, 04 Aug 2013)
New Revision: 4866

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
Add INCLUDE_CONFIG_FILE option.  (Closes: #706736)

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-08-04 20:04:53 UTC (rev 4865)
+++ trunk/kfreebsd-10/debian/changelog	2013-08-04 20:53:14 UTC (rev 4866)
@@ -5,6 +5,7 @@
     - Let GENERIC define lpt, ppi, tun, gif and faith. There seems to
       be no particular reason to diverge on these.
     - Don't include LINPROCFS and COMPAT_LINUX in GENERIC. DEBIAN already does.
+  * Add INCLUDE_CONFIG_FILE option.  (Closes: #706736)
 
  -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 21:44:17 +0200
 

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2013-08-04 20:04:53 UTC (rev 4865)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2013-08-04 20:53:14 UTC (rev 4866)
@@ -48,7 +48,7 @@
  options 	SYSVSHM			# SYSV-style shared memory
 --- /dev/null
 +++ b/sys/conf/DEBIAN
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,40 @@
 +# Common options to all Debian GNU/kFreeBSD kernels
 +
 +options		LINPROCFS
@@ -58,6 +58,9 @@
 +options         QUOTA
 +options		KTRACE
 +
++# See #706736
++options		INCLUDE_CONFIG_FILE
++
 +# Floppy drives need not be built-in because our installer doesn't
 +# include a "floppy" flavour (and probably never will).
 +nodevice	fdc