[Glibc-bsd-commits] r4783 - in trunk/kfreebsd-10/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-07-22 16:25:08 +0000 (Mon, 22 Jul 2013)
New Revision: 4783

Removed:
   trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/902_version.diff
   trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
   trunk/kfreebsd-10/debian/patches/922_cc_version.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
   trunk/kfreebsd-10/debian/patches/series
Log:
  * New upstream snapshot.
    - Implements freebsd32_ktimer_* syscalls. (Closes: #666730)

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/changelog	2013-07-22 16:25:08 UTC (rev 4783)
@@ -1,5 +1,9 @@
-kfreebsd-10 (10.0~svn252032-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn253544-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+    - Implements freebsd32_ktimer_* syscalls. (Closes: #666730)
+
+  [ Robert Millan ]
   * Remove 951_disable_mk_magic.diff, use -DWITHOUT_CTF instead.
   * Split kernel_cc into cc_cmd and cc_pkg (this makes it easier to
     enable clang when desired).
@@ -7,7 +11,7 @@
   * mount_remount.diff: Implement "mount -o remount" glue in kernel like
     upstream wants.
 
- -- Robert Millan <rmh at debian.org>  Tue, 02 Jul 2013 17:05:10 +0200
+ -- Robert Millan <rmh at debian.org>  Mon, 22 Jul 2013 16:53:35 +0200
 
 kfreebsd-10 (10.0~svn252032-1) experimental; urgency=low
 

Deleted: trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-07-22 16:25:08 UTC (rev 4783)
@@ -1,22 +0,0 @@
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -81,7 +81,7 @@
- 	${_ctau} \
- 	ctl \
- 	${_cxgb} \
--	cxgbe \
-+	${_cxgbe} \
- 	${_cyclic} \
- 	dc \
- 	dcons \
-@@ -384,6 +384,10 @@
- .endif
- .endif
- 
-+.if ${MK_SOURCELESS_UCODE} != "no"
-+_cxgbe=		cxgbe
-+.endif
-+
- .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
- .if exists(${.CURDIR}/../opencrypto)
- _crypto=	crypto

Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff	2013-07-22 16:25:08 UTC (rev 4783)
@@ -1,6 +1,6 @@
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -155,7 +155,7 @@
+@@ -165,7 +165,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"

Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2013-07-22 16:25:08 UTC (rev 4783)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -170,8 +170,6 @@
+@@ -171,8 +171,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: trunk/kfreebsd-10/debian/patches/922_cc_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/922_cc_version.diff	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/patches/922_cc_version.diff	2013-07-22 16:25:08 UTC (rev 4783)
@@ -10,5 +10,5 @@
 -compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
 +compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
  
- for dir in /bin /usr/bin /usr/local/bin; do
- 	if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then
+ if [ -x /usr/bin/svnliteversion ] ; then
+ 	svnversion=/usr/bin/svnliteversion

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2013-07-22 16:25:08 UTC (rev 4783)
@@ -30,7 +30,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -201,9 +198,6 @@
+@@ -202,9 +199,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -40,7 +40,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -301,10 +295,7 @@
+@@ -302,10 +296,7 @@
  options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -96,7 +96,7 @@
  # ATA controllers
  device		ahci		# AHCI-compatible SATA controllers
  device		ata		# Legacy ATA/SATA controllers
-@@ -212,9 +211,6 @@
+@@ -213,9 +212,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -106,7 +106,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -315,10 +311,7 @@
+@@ -316,10 +312,7 @@
  options 	RDRAND_RNG	# Intel Bull Mountain RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2013-07-22 16:24:11 UTC (rev 4782)
+++ trunk/kfreebsd-10/debian/patches/series	2013-07-22 16:25:08 UTC (rev 4783)
@@ -1,5 +1,4 @@
 # Patches from (or merged in) upstream
-000_cxgbe.diff
 
 # Patches that are in good shape for merging upstream
 mount_remount.diff