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

stevenc-guest at alioth.debian.org stevenc-guest at alioth.debian.org
Thu Jul 9 10:08:32 UTC 2015 

Author: stevenc-guest
Date: 2015-07-09 10:08:32 +0000 (Thu, 09 Jul 2015)
New Revision: 5728

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/004_xargs.diff
   trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff
   trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff
   trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff
   trunk/kfreebsd-11/debian/patches/999_config.diff
Log:
* Disable building si(4) as module, due to non-free microcode
* Refresh patches:
004_xargs.diff
906_grow_sysv_ipc_limits.diff
920_linux_cflags.diff
921_signal_watchdog.diff
999_config.diff


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2015-07-09 10:02:14 UTC (rev 5727)
+++ trunk/kfreebsd-11/debian/changelog	2015-07-09 10:08:32 UTC (rev 5728)
@@ -25,11 +25,13 @@
       - 918_unix_socket_overflow.diff
       - 920_linux_cflags.diff
       - 921_signal_watchdog.diff
-    - Remove obsolete patch:
+      - 999_config.diff
+    - Remove obsolete patches:
       - vxge_no_ctf.diff
       - 922_cc_version.diff
     - New patch:
       - 930_freebsd_cc.diff (Unset FREEBSD_CC)
+    - Disable building si(4) as module, due to non-free microcode
   * Manually set COMPILER_TYPE and COMPILER_VERSION in debian/rules, as
     bsd.compiler.mk doesn't detect our own compiler version correctly
   * Set WITHOUT_FORMAT_EXTENSIONS, a FreeBSD compiler extension we

Modified: trunk/kfreebsd-11/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/004_xargs.diff	2015-07-09 10:02:14 UTC (rev 5727)
+++ trunk/kfreebsd-11/debian/patches/004_xargs.diff	2015-07-09 10:08:32 UTC (rev 5728)
@@ -6,7 +6,7 @@
 
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -212,7 +212,7 @@
+@@ -215,7 +215,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
  	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -30,3 +30,19 @@
  
  # canonify include paths
  for H in ${src_headers}; do
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -200,12 +200,9 @@
+ 	rm -f .newdep
+ 	${MAKE} -V CFILES_NOCDDL -V SYSTEM_CFILES -V GEN_CFILES | \
+ 	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
+-	${MAKE} -V CFILES_CDDL | \
+-	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS} ${FBT_CFLAGS} ${DTRACE_CFLAGS}
++	# GNU xargs behaves differently when given a single newline character.
+ 	${MAKE} -V SFILES_NOCDDL | \
+ 	    MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
+-	${MAKE} -V SFILES_CDDL | \
+-	    MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ZFS_ASM_CFLAGS}
+ 	rm -f .depend
+ 	mv .newdep .depend
+ 

Modified: trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff	2015-07-09 10:02:14 UTC (rev 5727)
+++ trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff	2015-07-09 10:08:32 UTC (rev 5728)
@@ -23,7 +23,7 @@
 
 --- a/sys/amd64/conf/GENERIC
 +++ b/sys/amd64/conf/GENERIC
-@@ -62,6 +62,11 @@
+@@ -61,6 +61,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
@@ -37,7 +37,7 @@
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -63,6 +63,11 @@
+@@ -62,6 +62,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores

Modified: trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff	2015-07-09 10:02:14 UTC (rev 5727)
+++ trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff	2015-07-09 10:08:32 UTC (rev 5728)
@@ -16,7 +16,7 @@
  
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -86,6 +86,8 @@
+@@ -89,6 +89,8 @@
  CFLAGS+=	-D_KERNEL
  CFLAGS+=	-DKLD_MODULE
  

Modified: trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff	2015-07-09 10:02:14 UTC (rev 5727)
+++ trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff	2015-07-09 10:08:32 UTC (rev 5728)
@@ -37,7 +37,7 @@
  };
 --- a/sys/kern/kern_prot.c
 +++ b/sys/kern/kern_prot.c
-@@ -1557,8 +1557,8 @@
+@@ -1560,8 +1560,8 @@
  	 * pretty safe to do since the only way to create two processes
  	 * with the same p_leader is via rfork(2).
  	 */

Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff	2015-07-09 10:02:14 UTC (rev 5727)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2015-07-09 10:08:32 UTC (rev 5728)
@@ -11,7 +11,7 @@
  
  makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
  makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-@@ -56,7 +56,7 @@
+@@ -55,7 +55,7 @@
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
  options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
  options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
@@ -37,7 +37,7 @@
  
  makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
  makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-@@ -57,7 +57,7 @@
+@@ -56,7 +56,7 @@
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
  options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
  options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
@@ -129,3 +129,15 @@
 +
 +# Enable minimum debugger support
 +options 	KDB_TRACE		# Print a stack trace for a panic.
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -528,7 +528,9 @@
+ .endif
+ _safe=		safe
+ _scsi_low=	scsi_low
++.if ${MK_SOURCELESS_UCODE} != "no"
+ _si=		si
++.endif
+ _speaker=	speaker
+ _splash=	splash
+ _sppp=		sppp

More information about the Glibc-bsd-commits mailing list