[Glibc-bsd-commits] r5192 - in trunk/kfreebsd-11/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-30 00:19:27 +0000 (Sat, 30 Nov 2013)
New Revision: 5192

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.in
   trunk/kfreebsd-11/debian/patches/999_config.diff
   trunk/kfreebsd-11/debian/rules
Log:
Build with CTF debug information, and enable KDTRACE_HOOKS (DTrace hooks) and DDB_CTF (CTF support in ELF loader) for debug builds.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-11-30 00:06:11 UTC (rev 5191)
+++ trunk/kfreebsd-11/debian/changelog	2013-11-30 00:19:27 UTC (rev 5192)
@@ -3,6 +3,8 @@
   * Implement a watchdog to detect when upstream switches to a new Clang
     version.
   * Disable pty(4) to follow upstream.
+  * Build with CTF debug information, and enable KDTRACE_HOOKS (DTrace
+    hooks) and DDB_CTF (CTF support in ELF loader) for debug builds.
 
  -- Robert Millan <rmh at debian.org>  Fri, 29 Nov 2013 14:05:10 +0100
 

Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in	2013-11-30 00:06:11 UTC (rev 5191)
+++ trunk/kfreebsd-11/debian/control.in	2013-11-30 00:19:27 UTC (rev 5192)
@@ -13,6 +13,7 @@
  @cc_pkg@, libdb-dev,
  libsbuf-dev (>= 9.0+ds1-2),
  kernel-wedge (>= 2.88) [kfreebsd-any],
+ ctfutils,
 Standards-Version: 3.9.2
 
 Package: kfreebsd-source- at version@

Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff	2013-11-30 00:06:11 UTC (rev 5191)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2013-11-30 00:19:27 UTC (rev 5192)
@@ -87,17 +87,15 @@
 +include		WITHOUT_SOURCELESS
 --- /dev/null
 +++ b/sys/conf/DEBIAN_DEBUG
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,20 @@
 +makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 +
-+## Not yet
-+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+nomakeoptions	WITH_CTF
++makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 +
-+## Not yet (IMPORTANT: KDTRACE_FRAME is only for amd64!!)
++## KDTRACE_FRAME is only for amd64
 +#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_HOOKS		# Kernel DTrace hooks
++options		DDB_CTF			# Kernel ELF linker loads CTF data
 +
 +options 	DDB			# Support DDB.
 +options 	GDB			# Support remote GDB.

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2013-11-30 00:06:11 UTC (rev 5191)
+++ trunk/kfreebsd-11/debian/rules	2013-11-30 00:19:27 UTC (rev 5192)
@@ -69,8 +69,6 @@
 MAKE	+= WERROR=
 endif
 
-MAKE += -DWITHOUT_CTF
-
 # Disable install of *.ko.symbols files (their presence would trigger an
 # "unstripped-binary-or-object" lintian error).
 MAKE += -DWITHOUT_KERNEL_SYMBOLS