[Glibc-bsd-commits] r4590 - in trunk/kfreebsd-10/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:43:12 UTC 2013
Author: rmh
Date: 2013-06-23 12:50:52 +0000 (Sun, 23 Jun 2013)
New Revision: 4590
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/999_config.diff
trunk/kfreebsd-10/debian/patches/series
Log:
Simplify handling of debug mode. To enable/disable debug options, just edit sys/conf/DEBIAN in 999_config.diff and comment/uncomment the appropiate line.
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2013-06-23 10:39:10 UTC (rev 4589)
+++ trunk/kfreebsd-10/debian/changelog 2013-06-23 12:50:52 UTC (rev 4590)
@@ -15,6 +15,9 @@
[ Robert Millan ]
* patches/913_uudecode.diff: Remove. It is pointless when using
WITHOUT_SOURCELESS.
+ * Simplify handling of debug mode. To enable/disable debug options,
+ just edit sys/conf/DEBIAN in 999_config.diff and comment/uncomment
+ the appropiate line.
-- Christoph Egger <christoph at debian.org> Thu, 20 Jun 2013 18:13:53 +0200
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2013-06-23 10:39:10 UTC (rev 4589)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2013-06-23 12:50:52 UTC (rev 4590)
@@ -1,6 +1,6 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -18,11 +18,11 @@
+@@ -18,8 +18,8 @@
#
# $FreeBSD$
@@ -9,13 +9,8 @@
+#cpu HAMMER
+#ident GENERIC
--makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
--makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-
- options SCHED_ULE # ULE scheduler
- options PREEMPTION # Enable kernel thread preemption
+ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
@@ -53,7 +53,7 @@
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -25,19 +20,6 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -72,9 +72,9 @@
- options CAPABILITY_MODE # Capsicum capability mode
- options CAPABILITIES # Capsicum capabilities
- options MAC # TrustedBSD MAC Framework
--options KDTRACE_FRAME # Ensure frames are compiled in
--options KDTRACE_HOOKS # Kernel DTrace hooks
--options DDB_CTF # Kernel ELF linker loads CTF data
-+#options KDTRACE_FRAME # Ensure frames are compiled in
-+#options KDTRACE_HOOKS # Kernel DTrace hooks
-+#options DDB_CTF # Kernel ELF linker loads CTF data
- options INCLUDE_CONFIG_FILE # Include this file in kernel
-
- # Debugging support. Always need this:
@@ -101,9 +101,6 @@
device acpi
device pci
@@ -71,7 +53,7 @@
# The `bpf' device enables the Berkeley Packet Filter.
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -18,13 +18,13 @@
+@@ -18,10 +18,10 @@
#
# $FreeBSD$
@@ -84,13 +66,8 @@
+#cpu I686_CPU
+#ident GENERIC
--makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
--makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-
- options SCHED_ULE # ULE scheduler
- options PREEMPTION # Enable kernel thread preemption
+ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
@@ -46,6 +46,8 @@
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
@@ -109,17 +86,6 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -73,8 +75,8 @@
- options CAPABILITY_MODE # Capsicum capability mode
- options CAPABILITIES # Capsicum capabilities
- options MAC # TrustedBSD MAC Framework
--options KDTRACE_HOOKS # Kernel DTrace hooks
--options DDB_CTF # Kernel ELF linker loads CTF data
-+#options KDTRACE_HOOKS # Kernel DTrace hooks
-+#options DDB_CTF # Kernel ELF linker loads CTF data
- options INCLUDE_CONFIG_FILE # Include this file in kernel
-
- # Debugging support. Always need this:
@@ -103,9 +105,6 @@
device eisa
device pci
@@ -153,7 +119,7 @@
# The `bpf' device enables the Berkeley Packet Filter.
--- /dev/null
+++ b/sys/conf/DEBIAN
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,33 @@
+# Common options to all Debian GNU/kFreeBSD kernels
+
+options LINPROCFS
@@ -173,29 +139,10 @@
+# but unfortunetely glibc doesn't support pts(4) yet (see #667448).
+device pty
+
-+# 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:
++# Toggle to enable/disable debug options.
++include DEBIAN_DEBUG
++#include DEBIAN_NODEBUG
+
-+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 # 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 2013-06-23 10:39:10 UTC (rev 4589)
+++ trunk/kfreebsd-10/debian/patches/series 2013-06-23 12:50:52 UTC (rev 4590)
@@ -30,6 +30,3 @@
922_cc_version.diff
951_disable_mk_magic.diff
999_config.diff
-
-# temporary
-debugger.diff
More information about the Glibc-bsd-commits
mailing list