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

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-21 14:06:56 +0000 (Fri, 21 Feb 2014)
New Revision: 5432

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/999_config.diff
   trunk/kfreebsd-11/debian/rules
Log:
Support debug flag in DEB_BUILD_OPTIONS.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2014-02-17 16:01:30 UTC (rev 5431)
+++ trunk/kfreebsd-11/debian/changelog	2014-02-21 14:06:56 UTC (rev 5432)
@@ -1,3 +1,9 @@
+kfreebsd-11 (11.0~svn261628-2) UNRELEASED; urgency=low
+
+  * Support debug flag in DEB_BUILD_OPTIONS.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 21 Feb 2014 15:06:38 +0100
+
 kfreebsd-11 (11.0~svn261628-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff	2014-02-17 16:01:30 UTC (rev 5431)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2014-02-21 14:06:56 UTC (rev 5432)
@@ -48,7 +48,7 @@
  options 	SYSVSHM			# SYSV-style shared memory
 --- /dev/null
 +++ b/sys/conf/DEBIAN
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,32 @@
 +# Common options to all Debian GNU/kFreeBSD kernels
 +
 +options		LINPROCFS
@@ -71,10 +71,6 @@
 +device		pfsync
 +device		pflog
 +
-+# Toggle to enable/disable debug options.
-+include		DEBIAN_DEBUG
-+#include	DEBIAN_NODEBUG
-+
 +# Alternate queueing
 +options		ALTQ
 +options		ALTQ_CBQ	# Class Bases Queuing (CBQ)
@@ -87,7 +83,10 @@
 +include		WITHOUT_SOURCELESS
 --- /dev/null
 +++ b/sys/conf/DEBIAN_DEBUG
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,23 @@
++
++## Enable debugging options
++
 +makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 +
 +makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
@@ -110,7 +109,10 @@
 +nooptions 	KDB_TRACE		# Print a stack trace for a panic.
 --- /dev/null
 +++ b/sys/conf/DEBIAN_NODEBUG
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,21 @@
++
++## Disable debugging options (except KDB_TRACE)
++
 +nomakeoptions	DEBUG			# Build kernel with gdb(1) debug symbols
 +nomakeoptions	WITH_CTF		# Run ctfconvert(1) for DTrace support
 +

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2014-02-17 16:01:30 UTC (rev 5431)
+++ trunk/kfreebsd-11/debian/rules	2014-02-21 14:06:56 UTC (rev 5432)
@@ -50,6 +50,12 @@
 	BSD_MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	debug_config	:= sys/conf/DEBIAN_DEBUG
+else
+	debug_config	:= sys/conf/DEBIAN_NODEBUG
+endif
+
 MAKE		:= \
 		MAKEFLAGS=$(BSD_MAKEFLAGS) \
 		bmake \
@@ -173,7 +179,10 @@
 # Anti-dependency on build-indep (it needs a pristine build directory)
 build-flavor-%-stamp: build-indep
 	# Configure the kernel
-	cp debian/arch/$(cpu)/$*.config sys/$(kfreebsd_cpu)/conf/
+	cat \
+		debian/arch/$(cpu)/$*.config \
+		$(debug_config) \
+		> sys/$(kfreebsd_cpu)/conf/$*.config
 	cd sys/$(kfreebsd_cpu)/conf && config $*.config
 
 	# Change ident to the kernel version