[Glibc-bsd-commits] r4131 - in trunk/kfreebsd-10/debian: arch/i386 patches

[Robert Millan]

Author: rmh
Date: 2012-02-26 12:19:16 +0000 (Sun, 26 Feb 2012)
New Revision: 4131

Modified:
   trunk/kfreebsd-10/debian/arch/i386/xen.config
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
Move ALTQ definitions to DEBIAN as well.

Modified: trunk/kfreebsd-10/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/xen.config	2012-02-26 12:15:40 UTC (rev 4130)
+++ trunk/kfreebsd-10/debian/arch/i386/xen.config	2012-02-26 12:19:16 UTC (rev 4131)
@@ -11,13 +11,6 @@
 nooption 	WITNESS			# Enable checks to detect deadlocks and cycles
 nooption 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 
-# Alternate queueing
-options		ALTQ
-options		ALTQ_CBQ        # Class Bases Queuing (CBQ)
-options		ALTQ_RED        # Random Early Detection (RED)
-options		ALTQ_RIO        # RED In/Out
-options		ALTQ_HFSC       # Hierarchical Packet Scheduler (HFSC)
-options		ALTQ_PRIQ       # Priority Queuing (PRIQ)
 options		ALTQ_NOPCC      # Required for SMP build
 
 # kFreeBSD needs

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-26 12:15:40 UTC (rev 4130)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-26 12:19:16 UTC (rev 4131)
@@ -107,7 +107,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -341,15 +303,15 @@
+@@ -341,14 +303,6 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  
@@ -122,15 +122,6 @@
  # MMC/SD
  device		mmc		# MMC/SD bus
  device		mmcsd		# MMC/SD memory card
- device		sdhci		# Generic PCI SD Host Controller
-+
-+# Alternate queueing
-+options		ALTQ
-+options		ALTQ_CBQ	# Class Bases Queuing (CBQ)
-+options		ALTQ_RED	# Random Early Detection (RED)
-+options		ALTQ_RIO	# RED In/Out
-+options		ALTQ_HFSC	# Hierarchical Packet Scheduler (HFSC)
-+options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
 @@ -18,12 +18,14 @@
@@ -279,7 +270,7 @@
 +options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
 --- /dev/null
 +++ b/sys/conf/DEBIAN
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,25 @@
 +# Common options to all Debian GNU/kFreeBSD kernels
 +
 +options		LINPROCFS
@@ -287,6 +278,7 @@
 +options		FDESCFS
 +options		TMPFS
 +options         QUOTA
++options		KTRACE
 +
 +# Network options
 +device		carp
@@ -294,5 +286,13 @@
 +device		pfsync
 +device		pflog
 +
++# Alternate queueing
++options		ALTQ
++options		ALTQ_CBQ	# Class Bases Queuing (CBQ)
++options		ALTQ_RED	# Random Early Detection (RED)
++options		ALTQ_RIO	# RED In/Out
++options		ALTQ_HFSC	# Hierarchical Packet Scheduler (HFSC)
++options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
++
 +# Disable binary blobs
 +include		WITHOUT_SOURCELESS