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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-10 23:52:58 +0000 (Sun, 10 Apr 2016)
New Revision: 6004

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.in
   trunk/kfreebsd-11/debian/patches/999_config.diff
Log:
Disable generating DTrace CTF data, until our toolchain (ctfutils)
is ready to support kfreebsd-11


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2016-04-10 23:38:50 UTC (rev 6003)
+++ trunk/kfreebsd-11/debian/changelog	2016-04-10 23:52:58 UTC (rev 6004)
@@ -1,4 +1,4 @@
-kfreebsd-11 (11.0~svn295083-1) UNRELEASED; urgency=medium
+kfreebsd-11 (11.0~svn295083-1~debug1) experimental; urgency=medium
 
   * New upstream snapshot of -CURRENT
   * Make get-orig-source tarball reproducible
@@ -28,6 +28,8 @@
   * Bump Build-Depends: freebsd-buildutils, freebsd-mk to (>= 10.3~)
   * Automatically enable debug options if ~debug appears in the Version
   * Replace ar9300_devid.h with a DFSG-free re-implementation
+  * Disable generating DTrace CTF data, until our toolchain (ctfutils)
+    is ready to support kfreebsd-11
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 06 Feb 2016 16:17:19 +0000
 

Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in	2016-04-10 23:38:50 UTC (rev 6003)
+++ trunk/kfreebsd-11/debian/control.in	2016-04-10 23:52:58 UTC (rev 6004)
@@ -17,9 +17,9 @@
  @cc_pkg@, libdb-dev,
  libsbuf-dev (>= 9.0+ds1-2),
  kernel-wedge (>= 2.88) [kfreebsd-any],
- ctfutils,
-# ctfconvert requires libdwarf with correct Dwarf_Off size
- libdwarf-freebsd-3 (>= 10.0-2~),
+# ctfutils (>= 10.3~),
+## ctfconvert requires libdwarf with correct Dwarf_Off size
+# libdwarf-freebsd-3 (>= 10.0-2~),
 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	2016-04-10 23:38:50 UTC (rev 6003)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2016-04-10 23:52:58 UTC (rev 6004)
@@ -83,16 +83,18 @@
 +include		WITHOUT_SOURCELESS
 --- /dev/null
 +++ b/sys/conf/DEBIAN_DEBUG
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,23 @@
 +
 +## Enable debugging options
 +
-+makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
++# Not yet...
++#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
++nomakeoptions 	WITH_CTF
 +
-+## 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
++### 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 	DDB			# Support DDB.
 +options 	GDB			# Support remote GDB.