[Glibc-bsd-commits] r4171 - in trunk/kfreebsd-10/debian: . arch/i386 patches
Robert Millan
rmh at alioth.debian.org
Wed Apr 4 14:18:23 UTC 2012
Author: rmh
Date: 2012-04-04 14:18:22 +0000 (Wed, 04 Apr 2012)
New Revision: 4171
Removed:
trunk/kfreebsd-10/debian/patches/952_nodebug.diff
Modified:
trunk/kfreebsd-10/debian/arch/i386/xen.config
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/999_config.diff
trunk/kfreebsd-10/debian/patches/series
Log:
Merge 952_nodebug.diff and the debug bits of debian/arch/i386/xen.config into sys/conf/DEBIAN.
Modified: trunk/kfreebsd-10/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/xen.config 2012-04-03 05:40:54 UTC (rev 4170)
+++ trunk/kfreebsd-10/debian/arch/i386/xen.config 2012-04-04 14:18:22 UTC (rev 4171)
@@ -5,13 +5,6 @@
ident Debian-xen
makeoptions COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
-# disable extra checks enabled in upstream XEN config
-nooption INVARIANTS # Enable calls of extra sanity checking
-nooption INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
-nooption WITNESS # Enable checks to detect deadlocks and cycles
-nooption WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-
-
# kFreeBSD needs
options COMPAT_LINUX
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-04-03 05:40:54 UTC (rev 4170)
+++ trunk/kfreebsd-10/debian/changelog 2012-04-04 14:18:22 UTC (rev 4171)
@@ -7,8 +7,10 @@
* Remove ALTQ_NOPCC in kernel configs, it is no longer required by SMP
systems (see altq_subr.c).
* Defer SMP kernel option to upstream config.
+ * Merge 952_nodebug.diff and the debug bits of
+ debian/arch/i386/xen.config into sys/conf/DEBIAN.
- -- Robert Millan <rmh at debian.org> Sun, 18 Mar 2012 18:12:03 +0100
+ -- Robert Millan <rmh at debian.org> Wed, 04 Apr 2012 16:18:09 +0200
kfreebsd-10 (10.0~svn232747-1) experimental; urgency=low
Deleted: trunk/kfreebsd-10/debian/patches/952_nodebug.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/952_nodebug.diff 2012-04-03 05:40:54 UTC (rev 4170)
+++ trunk/kfreebsd-10/debian/patches/952_nodebug.diff 2012-04-04 14:18:22 UTC (rev 4171)
@@ -1,50 +0,0 @@
-
-Full debugger support is disabled by upstream when a branch is close to
-release. Unfortunately this can trigger the appearance of heisenbugs
-which were previously hidden (we've been hit by this already, see #651624).
-
-This patch disables full debugger support in advance, so that the build
-configuration which is going to be used for release is tested during the
-whole release cycle. If you need a debug kernel, simply remove/disable
-this patch.
-
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -75,16 +75,7 @@
- # Debugging support. Always need this:
- options KDB # Enable kernel debugger support.
- # For minimum debugger support (stable branch) use:
--#options KDB_TRACE # Print a stack trace for a panic.
--# For full debugger support use this instead:
--options DDB # Support DDB.
--options GDB # Support remote GDB.
--options DEADLKRES # Enable the deadlock resolver
--options INVARIANTS # Enable calls of extra sanity checking
--options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
--options WITNESS # Enable checks to detect deadlocks and cycles
--options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
--options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
-+options KDB_TRACE # Print a stack trace for a panic.
-
- # Make an SMP-capable kernel by default
- options SMP # Symmetric MultiProcessor Kernel
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -75,16 +75,7 @@
- # Debugging support. Always need this:
- options KDB # Enable kernel debugger support.
- # For minimum debugger support (stable branch) use:
--#options KDB_TRACE # Print a stack trace for a panic.
--# For full debugger support use this instead:
--options DDB # Support DDB.
--options GDB # Support remote GDB.
--options DEADLKRES # Enable the deadlock resolver
--options INVARIANTS # Enable calls of extra sanity checking
--options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
--options WITNESS # Enable checks to detect deadlocks and cycles
--options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
--options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
-+options KDB_TRACE # Print a stack trace for a panic.
-
- # To make an SMP kernel, the next two lines are needed
- options SMP # Symmetric MultiProcessor Kernel
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-04-03 05:40:54 UTC (rev 4170)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-04-04 14:18:22 UTC (rev 4171)
@@ -25,7 +25,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -87,9 +89,6 @@
+@@ -96,9 +98,6 @@
device acpi
device pci
@@ -35,7 +35,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -186,10 +185,6 @@
+@@ -195,10 +194,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -46,7 +46,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -280,11 +275,8 @@
+@@ -289,11 +284,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -58,7 +58,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -311,13 +303,6 @@
+@@ -320,13 +312,6 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -112,7 +112,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -89,9 +93,6 @@
+@@ -98,9 +102,6 @@
device eisa
device pci
@@ -122,7 +122,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -196,10 +197,6 @@
+@@ -205,10 +206,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -133,7 +133,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -293,11 +290,8 @@
+@@ -302,11 +299,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -145,7 +145,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -324,13 +318,6 @@
+@@ -333,13 +327,6 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -161,7 +161,7 @@
device mmcsd # MMC/SD memory card
--- /dev/null
+++ b/sys/conf/DEBIAN
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,48 @@
+# Common options to all Debian GNU/kFreeBSD kernels
+
+options LINPROCFS
@@ -177,6 +177,29 @@
+device pfsync
+device pflog
+
++# Full debugger support is disabled by upstream when a branch is close to
++# release. Unfortunately this can trigger the appearance of heisenbugs
++# which were previously hidden (we've been hit by this already, see #651624).
++#
++# This disables full debugger support in advance, so that the build
++# configuration which is going to be used for release is tested during the
++# whole release cycle. If you need a debug kernel, simply remove/comment
++# the following lines:
++
++nooption DDB # Support DDB.
++nooption GDB # Support remote GDB.
++nooption DEADLKRES # Enable the deadlock resolver
++nooption INVARIANTS # Enable calls of extra sanity checking
++nooption INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
++nooption WITNESS # Enable checks to detect deadlocks and cycles
++nooption WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
++nooption MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
++
++# Usually when full debugger is enabled, minimum debugger support is disabled.
++# Bring it back:
++
++options KDB_TRACE # Print a stack trace for a panic.
++
+# Alternate queueing
+options ALTQ
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2012-04-03 05:40:54 UTC (rev 4170)
+++ trunk/kfreebsd-10/debian/patches/series 2012-04-04 14:18:22 UTC (rev 4171)
@@ -29,5 +29,4 @@
919_delete_key.diff
920_linux_cflags.diff
951_disable_mk_magic.diff
-952_nodebug.diff
999_config.diff
More information about the Glibc-bsd-commits
mailing list