[Glibc-bsd-commits] r1956 - in trunk/kfreebsd-7/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-06-20 10:21:09 +0000 (Wed, 20 Jun 2007)
New Revision: 1956

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-7/debian/patches/913_uudecode.diff
Log:
* update against CURRENT FreeBSD 7



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-05-30 18:56:31 UTC (rev 1955)
+++ trunk/kfreebsd-7/debian/changelog	2007-06-20 10:21:09 UTC (rev 1956)
@@ -1,4 +1,4 @@
-kfreebsd-7 (6.99+20070530-1) UNRELEASED; urgency=low
+kfreebsd-7 (6.99+20070620-1) UNRELEASED; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of HEAD

Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2007-05-30 18:56:31 UTC (rev 1955)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2007-06-20 10:21:09 UTC (rev 1956)
@@ -119,15 +119,6 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -211,7 +209,7 @@
- device		lge		# Level 1 LXT1001 gigabit Ethernet
- device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
- device		nge		# NatSemi DP83820 gigabit Ethernet
--device		nve		# nVidia nForce MCP on-board Ethernet Networking
-+device		nfe		# nVidia nForce MCP on-board Ethernet Networking
- device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
- device		re		# RealTek 8139C+/8169/8169S/8110S
- device		rl		# RealTek 8129/8139
 Index: sys/modules/Makefile
 ===================================================================
 --- sys/modules/Makefile.orig	2007-05-30 17:48:05.000000000 +0200
@@ -298,15 +289,6 @@
  device		iir		# Intel Integrated RAID
  device		ips		# IBM (Adaptec) ServeRAID
  device		mly		# Mylex AcceleRAID/eXtremeRAID
-@@ -200,7 +198,7 @@
- device		lge		# Level 1 LXT1001 gigabit Ethernet
- device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
- device		nge		# NatSemi DP83820 gigabit Ethernet
--device		nve		# nVidia nForce MCP on-board Ethernet Networking
-+device		nfe		# nVidia nForce MCP on-board Ethernet Networking
- device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
- device		re		# RealTek 8139C+/8169/8169S/8110S
- device		rl		# RealTek 8129/8139
 Index: sys/conf/files.amd64
 ===================================================================
 --- sys/conf/files.amd64.orig	2007-05-30 17:46:31.000000000 +0200

Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2007-05-30 18:56:31 UTC (rev 1955)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff	2007-06-20 10:21:09 UTC (rev 1956)
@@ -4,9 +4,9 @@
 @@ -16,7 +16,7 @@
  .if ${MACHINE_ARCH} != "ia64"
  # ld is broken on ia64
- t3fw-4.0.0.bin: ${CXGB}/t3fw-4.0.0.bin.gz.uu
--	uudecode -p < ${CXGB}/t3fw-4.0.0.bin.gz.uu \
-+	uudecode -o- < ${CXGB}/t3fw-4.0.0.bin.gz.uu \
+ t3fw-4.1.0.bin: ${CXGB}/t3fw-4.1.0.bin.gz.uu
+-	uudecode -p < ${CXGB}/t3fw-4.1.0.bin.gz.uu \
++	uudecode -o- < ${CXGB}/t3fw-4.1.0.bin.gz.uu \
  	| gzip -dc > ${.TARGET}
  
  FIRMWS= t3fw-4.0.0.bin:t3fw400