New upstream snapshot.

varialus · Jul 15, 2012 · 3636cc9 · 3636cc9
1 parent 2bacdeb
commit 3636cc9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/kfreebsd-10/debian/changelog b/kfreebsd-10/debian/changelog
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn238475-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Robert Millan <rmh@debian.org>  Sun, 15 Jul 2012 14:09:47 +0200
+
 kfreebsd-10 (10.0~svn237137-1) experimental; urgency=low
 
   * New upstream snapshot.

diff --git a/kfreebsd-10/debian/patches/004_xargs.diff b/kfreebsd-10/debian/patches/004_xargs.diff
@@ -32,7 +32,7 @@ http://savannah.gnu.org/patch/?4916
  for H in ${src_headers}; do
 --- a/sys/conf/kern.post.mk
 +++ b/sys/conf/kern.post.mk
-@@ -189,12 +189,9 @@
+@@ -199,12 +199,9 @@
  	rm -f .newdep
  	${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
  	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}

diff --git a/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff b/kfreebsd-10/debian/patches/906_grow_sysv_ipc_limits.diff
@@ -23,7 +23,7 @@ options         SEMMAP=256
 
 --- a/sys/amd64/conf/GENERIC
 +++ b/sys/amd64/conf/GENERIC
-@@ -57,6 +57,11 @@
+@@ -58,6 +58,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
@@ -37,7 +37,7 @@ options         SEMMAP=256
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -58,6 +58,11 @@
+@@ -59,6 +59,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores

diff --git a/kfreebsd-10/debian/patches/951_disable_mk_magic.diff b/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
@@ -3,7 +3,7 @@ freebsd-buildutils 9.0 doesn't define MK_CTF.
 
 --- a/sys/conf/kern.post.mk
 +++ b/sys/conf/kern.post.mk
-@@ -115,7 +115,7 @@
+@@ -125,7 +125,7 @@
  	@rm -f ${.TARGET}
  	@echo linking ${.TARGET}
  	${SYSTEM_LD}

diff --git a/kfreebsd-10/debian/patches/999_config.diff b/kfreebsd-10/debian/patches/999_config.diff
@@ -16,7 +16,7 @@
 
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -25,7 +25,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -70,9 +70,9 @@
+@@ -71,9 +71,9 @@
  options 	CAPABILITY_MODE		# Capsicum capability mode
  options 	CAPABILITIES		# Capsicum capabilities
  options 	MAC			# TrustedBSD MAC Framework
@@ -38,7 +38,7 @@
  options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
  # Debugging support.  Always need this:
-@@ -99,9 +99,6 @@
+@@ -100,9 +100,6 @@
  device		acpi
  device		pci
 
@@ -48,7 +48,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -198,10 +195,6 @@
+@@ -199,10 +196,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -59,7 +59,7 @@
 
  device		puc		# Multi I/O cards and multi-channel UARTs
 
-@@ -297,10 +290,7 @@
+@@ -298,10 +291,7 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -92,7 +92,7 @@
 
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
-@@ -44,6 +44,8 @@
+@@ -45,6 +45,8 @@
  options 	MSDOSFS			# MSDOS Filesystem
  options 	CD9660			# ISO 9660 Filesystem
  options 	PROCFS			# Process filesystem (requires PSEUDOFS)
@@ -101,7 +101,7 @@
  options 	PSEUDOFS		# Pseudo-filesystem framework
  options 	GEOM_PART_GPT		# GUID Partition Tables.
  options 	GEOM_RAID		# Soft RAID functionality.
-@@ -52,7 +54,7 @@
+@@ -53,7 +55,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
@@ -110,7 +110,7 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -71,8 +73,8 @@
+@@ -72,8 +74,8 @@
  options 	CAPABILITY_MODE		# Capsicum capability mode
  options 	CAPABILITIES		# Capsicum capabilities
  options 	MAC			# TrustedBSD MAC Framework
@@ -121,7 +121,7 @@
  options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
  # Debugging support.  Always need this:
-@@ -101,9 +103,6 @@
+@@ -102,9 +104,6 @@
  device		eisa
  device		pci
 
@@ -131,7 +131,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -208,10 +207,6 @@
+@@ -209,10 +208,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -142,7 +142,7 @@
 
  device		puc		# Multi I/O cards and multi-channel UARTs
 
-@@ -310,10 +305,7 @@
+@@ -311,10 +306,7 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support