[Glibc-bsd-commits] r4248 - trunk/kfreebsd-10/debian/patches

[Robert Millan]

Author: rmh
Date: 2012-04-29 19:37:25 +0000 (Sun, 29 Apr 2012)
New Revision: 4248

Modified:
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
Disable the rest of CTF-related options, it's no good having them on non-WITH_CTF kernels.

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-04-29 10:23:25 UTC (rev 4247)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-04-29 19:37:25 UTC (rev 4248)
@@ -25,6 +25,26 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
+@@ -69,8 +69,8 @@
+ 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 	KDTRACE_FRAME		# Ensure frames are compiled in
++#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+ 
+ # Debugging support.  Always need this:
+@@ -80,7 +80,7 @@
+ # For full debugger support use this instead:
+ options 	DDB			# Support DDB.
+ options 	GDB			# Support remote GDB.
+-options 	DDB_CTF			# kernel ELF linker loads CTF data
++#options 	DDB_CTF			# kernel ELF linker loads CTF data
+ 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
 @@ -98,9 +98,6 @@
  device		acpi
  device		pci
@@ -97,6 +117,24 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
+@@ -70,7 +72,7 @@
+ options 	CAPABILITY_MODE		# Capsicum capability mode
+ options 	CAPABILITIES		# Capsicum capabilities
+ options 	MAC			# TrustedBSD MAC Framework
+-options 	KDTRACE_HOOKS		# Kernel DTrace hooks
++#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+ 
+ # Debugging support.  Always need this:
+@@ -80,7 +82,7 @@
+ # For full debugger support use this instead:
+ options 	DDB			# Support DDB.
+ options 	GDB			# Support remote GDB.
+-options 	DDB_CTF			# kernel ELF linker loads CTF data
++#options 	DDB_CTF			# kernel ELF linker loads CTF data
+ 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
 @@ -100,9 +102,6 @@
  device		eisa
  device		pci