[Glibc-bsd-commits] r3444 - in trunk/kfreebsd-9/debian: . patches

Robert Millan rmh at alioth.debian.org
Wed Jun 15 17:44:34 UTC 2011 

Author: rmh
Date: 2011-06-15 17:44:34 +0000 (Wed, 15 Jun 2011)
New Revision: 3444

Added:
   trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/001_misc.diff
   trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
   trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff
   trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
   trunk/kfreebsd-9/debian/patches/999_config.diff
   trunk/kfreebsd-9/debian/patches/999_firmware.diff
   trunk/kfreebsd-9/debian/patches/series
   trunk/kfreebsd-9/debian/rules
Log:
Update to current upstream HEAD.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/changelog	2011-06-15 17:44:34 UTC (rev 3444)
@@ -1,4 +1,4 @@
-kfreebsd-9 (9.0~svn20110328-1) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn223109-1) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Now using Standards-Version 3.9.2 (no changes needed).

Modified: trunk/kfreebsd-9/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/001_misc.diff	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/001_misc.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -4,7 +4,7 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -1,5 +1,9 @@
+@@ -1,12 +1,23 @@
  # $FreeBSD$
  
 +.if !defined(OPSYS)
@@ -12,35 +12,29 @@
 +.endif
 +
  #
- # Warning flags for compiling the kernel and components of the kernel.
+ # Warning flags for compiling the kernel and components of the kernel:
  #
-@@ -9,10 +13,14 @@
- .if ${CC:T:Micc} == "icc"
- #CWARNFLAGS=	-w2	# use this if you are terribly bored
- CWARNFLAGS=
--.else
-+elif !defined(CWARNFLAGS)
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions
-+		-Wundef -Wno-pointer-sign
 +.if ${OPSYS} == "FreeBSD"
-+# FreeBSD extensions, not available in upstream GCC
-+CWARNFLAGS+=  -fformat-extensions
++# FreeBSD extension, not available in upstream GCC
++format_extensions=	-fformat-extensions
++no_align_long_strings=	-mno-align-long-strings
 +.endif
- .endif
++
+ CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
+ 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+-		-Wundef -Wno-pointer-sign -fformat-extensions \
++		-Wundef -Wno-pointer-sign ${format_extensions} \
+ 		-Wmissing-include-dirs -fdiagnostics-show-option
++
  #
  # The following flags are next up for working on:
-@@ -31,7 +39,11 @@
+ #	-Wextra
+@@ -32,7 +43,7 @@
  #
- .if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Micc} != "icc"
+ .if ${MACHINE_CPUARCH} == "i386"
  .if ${CC:T:Mclang} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+.if ${OPSYS} == "FreeBSD"
-+# FreeBSD extensions, not available in upstream GCC
-+CFLAGS+=	-mno-align-long-strings
-+.endif
-+CFLAGS+=	-mpreferred-stack-boundary=2
+-CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
++CFLAGS+=	${no_align_long_strings} -mpreferred-stack-boundary=2 -mno-sse
+ .else
+ CFLAGS+=	-mno-aes -mno-avx
  .endif
- CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
- INLINE_LIMIT?=	8000

Modified: trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -1,6 +1,17 @@
 --- a/sys/dev/aic7xxx/aicasm/Makefile
 +++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -14,8 +14,9 @@
+@@ -3,6 +3,10 @@
+ #
+ # $FreeBSD$
+ 
++.if !defined(OPSYS)
++OPSYS!=	uname -s
++.endif
++
+ PROG=	aicasm
+ 
+ CSRCS=	aicasm.c aicasm_symbol.c
+@@ -14,8 +18,9 @@
  SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
  CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
  DPADD=	${LIBL}
@@ -11,17 +22,16 @@
  
  # Correct path for kernel builds
  # Don't rely on the kernel's .depend file
-@@ -24,13 +25,6 @@
+@@ -24,8 +29,12 @@
  DEPENDFILE=	.depend_aicasm
  .endif
  
--.if ${CC:T:Micc} == "icc"
--CFLAGS+=	-restrict
--NOSTDINC=	-X
--.else
--NOSTDINC=	-nostdinc
--.endif
--CFLAGS+= ${NOSTDINC} -I/usr/include -I.
++# This would discard implicit include flags in upstream GCC
++.if ${OPSYS} == "FreeBSD"
+ NOSTDINC=	-nostdinc
+ CFLAGS+= ${NOSTDINC} -I/usr/include -I.
++.endif
++
  .ifdef MAKESRCPATH
  CFLAGS+= -I${MAKESRCPATH}
  .endif

Modified: trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/915_ip6.v6only.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -1,15 +1,15 @@
 --- a/sys/netinet6/in6_proto.c
 +++ b/sys/netinet6/in6_proto.c
-@@ -393,7 +393,7 @@
+@@ -408,7 +408,7 @@
  VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
  VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
  VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
 -VNET_DEFINE(int, ip6_accept_rtadv) = 0;
 +VNET_DEFINE(int, ip6_accept_rtadv) = 1;
+ VNET_DEFINE(int, ip6_no_radr) = 0;
+ VNET_DEFINE(int, ip6_norbit_raif) = 0;
  VNET_DEFINE(int, ip6_maxfragpackets);	/* initialized in frag6.c:frag6_init() */
- VNET_DEFINE(int, ip6_maxfrags);		/* initialized in frag6.c:frag6_init() */
- VNET_DEFINE(int, ip6_log_interval) = 5;
-@@ -406,7 +406,7 @@
+@@ -423,7 +423,7 @@
  VNET_DEFINE(int, ip6_rr_prune) = 5;	/* router renumbering prefix
  					 * walk list every 5 sec. */
  VNET_DEFINE(int, ip6_mcast_pmtu) = 0;	/* enable pMTU discovery for multicast? */

Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -8,18 +8,18 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -125,6 +125,8 @@
+@@ -133,6 +133,8 @@
  #
- # GCC SSP support.
+ # GCC SSP support
  #
 +# Disable stack protector as it causes kernel panic
 +MK_SSP=                no
- .if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && \
-     ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" && \
-     ${MACHINE_CPUARCH} != "mips"
+ .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
+ CFLAGS+=	-fstack-protector
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -151,6 +151,9 @@
+@@ -141,6 +141,9 @@
  CTFFLAGS+=	-g
  .endif
  

Added: trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -0,0 +1,48 @@
+
+freebsd-buildutils 8.2 doesn't support MK_INET_SUPPORT nor MK_OFED.
+
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -356,12 +356,11 @@
+ .endif
+ .endif
+ 
+-.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
++.if 1
+ _if_gre=	if_gre
+ .endif
+ 
+-.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
+-	defined(ALL_MODULES)
++.if 1
+ _if_carp=	if_carp
+ .endif
+ 
+@@ -373,8 +372,7 @@
+ _netgraph=	netgraph
+ .endif
+ 
+-.if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
+-	${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
++.if 1
+ _pf=		pf
+ _pflog=		pflog
+ .endif
+@@ -430,7 +428,7 @@
+ _linsysfs=	linsysfs
+ _linux=		linux
+ _mse=		mse
+-.if ${MK_OFED} != "no" || defined(ALL_MODULES)
++.if 1
+ _mlx4=		mlx4
+ _mlx4ib=	mlx4ib
+ _mlxen=		mlxen
+@@ -581,7 +579,7 @@
+ _linsysfs=	linsysfs
+ _linux=		linux
+ _mly=		mly
+-.if ${MK_OFED} != "no" || defined(ALL_MODULES)
++.if 1
+ _mlx4=		mlx4
+ _mlx4ib=	mlx4ib
+ _mlxen=		mlxen

Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -41,19 +41,10 @@
 -# Floppy drives
 -device		fdc
 -
- # ATA and ATAPI devices
- device		ata
- device		atadisk		# ATA disk drives
-@@ -102,6 +101,8 @@
- device		atapicd		# ATAPI CDROM drives
- device		atapifd		# ATAPI floppy drives
- device		atapist		# ATAPI tape drives
-+device		atapicam	# emulate ATAPI devices as SCSI via CAM
-+				# needs CAM to be present (scbus && pass)
- options 	ATA_STATIC_ID	# Static device numbering
- 
- # SCSI Controllers
-@@ -122,7 +123,6 @@
+ # ATA controllers
+ device		ahci		# AHCI-compatible SATA controllers
+ device		ata		# Legacy ATA/SATA controllers
+@@ -121,7 +120,6 @@
  device		trm		# Tekram DC395U/UW/F DC315U adapters
  
  device		adv		# Advansys SCSI adapters
@@ -61,7 +52,7 @@
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
  
-@@ -185,10 +185,6 @@
+@@ -185,10 +183,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -72,7 +63,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -202,8 +198,6 @@
+@@ -202,8 +196,6 @@
  device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
  device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
  device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
@@ -81,7 +72,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -213,12 +207,10 @@
+@@ -213,12 +205,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -94,7 +85,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -228,7 +220,6 @@
+@@ -228,7 +218,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -102,7 +93,7 @@
  device		sge		# Silicon Integrated Systems SiS190/191
  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
  device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -248,7 +239,6 @@
+@@ -248,7 +237,6 @@
  device		ex		# Intel EtherExpress Pro/10 and Pro/10+
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
@@ -110,7 +101,20 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -273,11 +263,8 @@
+@@ -268,12 +256,7 @@
+ device		ath_rate_sample	# SampleRate tx rate control for ath
+ #device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
+ #device		bwn		# Broadcom BCM43xx wireless NICs.
+-device		ipw		# Intel 2100 wireless NICs.
+-device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
+-device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
+ device		malo		# Marvell Libertas wireless NICs.
+-device		mwl		# Marvell 88W8363 802.11n wireless NICs.
+-device		ral		# Ralink Technology RT2500 wireless NICs.
+ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+ device		wpi		# Intel 3945ABG wireless NICs.
+ 
+@@ -282,11 +265,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -122,7 +126,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -297,7 +284,6 @@
+@@ -307,7 +287,6 @@
  device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
@@ -130,21 +134,28 @@
  # USB Serial devices
  device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
  device		uark		# Technologies ARK3116 based serial adapters
-@@ -317,10 +303,7 @@
+@@ -323,17 +302,13 @@
+ device		axe		# ASIX Electronics USB Ethernet
+ device		cdce		# Generic USB over Ethernet
+ device		cue		# CATC USB Ethernet
+-device		kue		# Kawasaki LSI USB Ethernet
  device		rue		# RealTek RTL8150 USB Ethernet
  device		udav		# Davicom DM9601E USB
  # USB Wireless
 -device		rum		# Ralink Technology RT2501USB wireless NICs
+ device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
 -device		uath		# Atheros AR5523 wireless NICs
+ device		upgt		# Conexant/Intersil PrismGT wireless NICs.
  device		ural		# Ralink Technology RT2500USB wireless NICs
+ device		urtw		# Realtek RTL8187B/L wireless NICs
 -device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -329,3 +312,11 @@
- device		fwip		# IP over FireWire (RFC 2734,3146)
- device		dcons		# Dumb console driver
- device		dcons_crom	# Configuration ROM for dcons
+@@ -350,3 +325,11 @@
+ device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
+ device		snd_uaudio	# USB Audio
+ device		snd_via8233	# VIA VT8233x Audio
 +
 +# Alternate queueing
 +options		ALTQ
@@ -209,19 +220,10 @@
 -# Floppy drives
 -device		fdc
 -
- # ATA and ATAPI devices
- device		ata
- device		atadisk		# ATA disk drives
-@@ -104,6 +105,8 @@
- device		atapicd		# ATAPI CDROM drives
- device		atapifd		# ATAPI floppy drives
- device		atapist		# ATAPI tape drives
-+device		atapicam	# emulate ATAPI devices as SCSI via CAM
-+				# needs CAM to be present (scbus && pass)
- options 	ATA_STATIC_ID	# Static device numbering
- 
- # SCSI Controllers
-@@ -124,7 +127,6 @@
+ # ATA controllers
+ device		ahci		# AHCI-compatible SATA controllers
+ device		ata		# Legacy ATA/SATA controllers
+@@ -123,7 +124,6 @@
  device		trm		# Tekram DC395U/UW/F DC315U adapters
  
  device		adv		# Advansys SCSI adapters
@@ -229,7 +231,7 @@
  device		aha		# Adaptec 154x SCSI adapters
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
-@@ -195,10 +197,6 @@
+@@ -195,10 +195,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -240,7 +242,7 @@
  
  # If you've got a "dumb" serial or parallel PCI card that is
  # supported by the puc(4) glue driver, uncomment the following
-@@ -212,8 +210,6 @@
+@@ -212,8 +208,6 @@
  device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
  device		ixgb		# Intel PRO/10GbE Ethernet Card
  device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
@@ -249,7 +251,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -223,12 +219,10 @@
+@@ -223,12 +217,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -262,7 +264,7 @@
  device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
  device		lge		# Level 1 LXT1001 gigabit Ethernet
  device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -238,7 +232,6 @@
+@@ -238,7 +230,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -270,7 +272,7 @@
  device		sge		# Silicon Integrated Systems SiS190/191
  device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
  device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -260,7 +253,6 @@
+@@ -260,7 +251,6 @@
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
  device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -278,7 +280,20 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -286,11 +278,8 @@
+@@ -280,12 +270,7 @@
+ device		ath_rate_sample	# SampleRate tx rate control for ath
+ #device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
+ #device		bwn		# Broadcom BCM43xx wireless NICs.
+-device		ipw		# Intel 2100 wireless NICs.
+-device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
+-device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
+ device		malo		# Marvell Libertas wireless NICs.
+-device		mwl		# Marvell 88W8363 802.11n wireless NICs.
+-device		ral		# Ralink Technology RT2500 wireless NICs.
+ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+ #device		wl		# Older non 802.11 Wavelan wireless NIC.
+ device		wpi		# Intel 3945ABG wireless NICs.
+@@ -295,11 +280,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -290,7 +305,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -310,7 +299,6 @@
+@@ -320,7 +302,6 @@
  device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
@@ -298,21 +313,28 @@
  # USB Serial devices
  device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
  device		uark		# Technologies ARK3116 based serial adapters
-@@ -330,10 +318,7 @@
+@@ -336,17 +317,13 @@
+ device		axe		# ASIX Electronics USB Ethernet
+ device		cdce		# Generic USB over Ethernet
+ device		cue		# CATC USB Ethernet
+-device		kue		# Kawasaki LSI USB Ethernet
  device		rue		# RealTek RTL8150 USB Ethernet
  device		udav		# Davicom DM9601E USB
  # USB Wireless
 -device		rum		# Ralink Technology RT2501USB wireless NICs
+ device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
 -device		uath		# Atheros AR5523 wireless NICs
+ device		upgt		# Conexant/Intersil PrismGT wireless NICs.
  device		ural		# Ralink Technology RT2500USB wireless NICs
+ device		urtw		# Realtek RTL8187B/L wireless NICs
 -device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -342,3 +327,11 @@
- device		fwip		# IP over FireWire (RFC 2734,3146)
- device		dcons		# Dumb console driver
- device		dcons_crom	# Configuration ROM for dcons
+@@ -363,3 +340,11 @@
+ device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
+ device		snd_uaudio	# USB Audio
+ device		snd_via8233	# VIA VT8233x Audio
 +
 +# Alternate queueing
 +options		ALTQ

Modified: trunk/kfreebsd-9/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_firmware.diff	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/999_firmware.diff	2011-06-15 17:44:34 UTC (rev 3444)
@@ -3,7 +3,7 @@
 
 --- a/sys/conf/files
 +++ b/sys/conf/files
-@@ -462,10 +462,6 @@
+@@ -488,10 +488,6 @@
  dev/advansys/advansys.c		optional adv
  dev/advansys/advlib.c		optional adv
  dev/advansys/advmcode.c		optional adv
@@ -12,17 +12,17 @@
 -dev/advansys/adwlib.c		optional adw
 -dev/advansys/adwmcode.c		optional adw
  dev/ae/if_ae.c			optional ae pci
- dev/age/if_age.c		optional age pci inet
+ dev/age/if_age.c		optional age pci
  dev/agp/agp.c			optional agp pci
-@@ -758,7 +754,6 @@
- dev/ath/ath_rate/sample/sample.c	optional ath_rate_sample \
+@@ -850,7 +846,6 @@
+ dev/ath/ath_dfs/null/dfs_null.c	optional	ath \
  	compile-with "${NORMAL_C} -I$S/dev/ath"
- #
+ # 
 -dev/bce/if_bce.c		optional bce
  dev/bfe/if_bfe.c		optional bfe
  dev/bge/if_bge.c		optional bge
  dev/bktr/bktr_audio.c		optional bktr pci
-@@ -794,34 +789,6 @@
+@@ -888,34 +883,6 @@
  dev/cs/if_cs.c			optional cs
  dev/cs/if_cs_isa.c		optional cs isa
  dev/cs/if_cs_pccard.c		optional cs pccard
@@ -54,10 +54,10 @@
 -	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 -dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw \
 -	compile-with "${NORMAL_C} -I$S/dev/cxgb"
- dev/cy/cy.c			optional cy
- dev/cy/cy_isa.c			optional cy isa
- dev/cy/cy_pci.c			optional cy pci
-@@ -832,13 +799,6 @@
+ dev/cxgbe/t4_main.c		optional cxgbe pci \
+ 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
+ dev/cxgbe/t4_sge.c		optional cxgbe pci \
+@@ -934,13 +901,6 @@
  dev/dcons/dcons_crom.c		optional dcons_crom
  dev/dcons/dcons_os.c		optional dcons
  dev/de/if_de.c			optional de pci
@@ -71,7 +71,7 @@
  dev/digi/digi.c			optional digi
  dev/digi/digi_isa.c		optional digi isa
  dev/digi/digi_pci.c		optional digi pci
-@@ -871,26 +831,6 @@
+@@ -976,26 +936,6 @@
  dev/drm/mach64_drv.c		optional mach64drm
  dev/drm/mach64_irq.c		optional mach64drm
  dev/drm/mach64_state.c		optional mach64drm
@@ -98,18 +98,19 @@
  dev/drm/savage_bci.c		optional savagedrm
  dev/drm/savage_drv.c		optional savagedrm
  dev/drm/savage_state.c		optional savagedrm
-@@ -972,7 +912,6 @@
- dev/firewire/sbp.c		optional sbp
+@@ -1091,7 +1031,6 @@
  dev/firewire/sbp_targ.c		optional sbp_targ
  dev/flash/at45d.c		optional at45d
--dev/fxp/if_fxp.c		optional fxp inet
+ dev/flash/mx25l.c		optional mx25l
+-dev/fxp/if_fxp.c		optional fxp
  dev/gem/if_gem.c		optional gem
  dev/gem/if_gem_pci.c		optional gem pci
  dev/gem/if_gem_sbus.c		optional gem sbus
-@@ -1022,48 +961,6 @@
+@@ -1148,49 +1087,6 @@
+ dev/ips/ips_disk.c		optional ips
  dev/ips/ips_ioctl.c		optional ips
  dev/ips/ips_pci.c		optional ips pci
- dev/ipw/if_ipw.c		optional ipw
+-dev/ipw/if_ipw.c		optional ipw
 -ipwbssfw.c			optional ipwbssfw | ipwfw		\
 -	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
 -	no-implicit-rule before-depend local				\
@@ -120,7 +121,7 @@
 -	no-implicit-rule						\
 -	clean		"ipw_bss.fwo"
 -ipw_bss.fw			optional ipwbssfw | ipwfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ipw/ipw2100-1.3.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"ipw_bss.fw"
@@ -134,7 +135,7 @@
 -	no-implicit-rule						\
 -	clean		"ipw_ibss.fwo"
 -ipw_ibss.fw			optional ipwibssfw | ipwfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu"	\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"ipw_ibss.fw"
@@ -148,19 +149,19 @@
 -	no-implicit-rule						\
 -	clean		"ipw_monitor.fwo"
 -ipw_monitor.fw			optional ipwmonitorfw | ipwfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu"	\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"ipw_monitor.fw"
  dev/iscsi/initiator/iscsi.c	optional iscsi_initiator scbus
  dev/iscsi/initiator/iscsi_subr.c	optional iscsi_initiator scbus
  dev/iscsi/initiator/isc_cam.c	optional iscsi_initiator scbus
-@@ -1076,135 +973,7 @@
+@@ -1203,163 +1099,6 @@
  dev/isp/isp_pci.c		optional isp pci
  dev/isp/isp_sbus.c		optional isp sbus
  dev/isp/isp_target.c		optional isp
 -dev/ispfw/ispfw.c		optional ispfw
- dev/iwi/if_iwi.c		optional iwi
+-dev/iwi/if_iwi.c		optional iwi
 -iwibssfw.c			optional iwibssfw | iwifw		\
 -	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
 -	no-implicit-rule before-depend local				\
@@ -171,7 +172,7 @@
 -	no-implicit-rule						\
 -	clean		"iwi_bss.fwo"
 -iwi_bss.fw			optional iwibssfw | iwifw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/iwi/ipw2200-bss.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwi_bss.fw"
@@ -185,7 +186,7 @@
 -	no-implicit-rule						\
 -	clean		"iwi_ibss.fwo"
 -iwi_ibss.fw			optional iwiibssfw | iwifw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/iwi/ipw2200-ibss.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwi_ibss.fw"
@@ -199,7 +200,7 @@
 -	no-implicit-rule						\
 -	clean		"iwi_monitor.fwo"
 -iwi_monitor.fw			optional iwimonitorfw | iwifw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/iwi/ipw2200-sniffer.fw.uu"	\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwi_monitor.fw"
@@ -214,8 +215,8 @@
 -	no-implicit-rule						\
 -	clean		"iwn1000fw.fwo"
 -iwn1000.fw			optional iwn1000fw | iwnfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu" \
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwn1000.fw"
 -iwn4965fw.c			optional iwn4965fw | iwnfw		\
@@ -228,7 +229,7 @@
 -	no-implicit-rule						\
 -	clean		"iwn4965fw.fwo"
 -iwn4965.fw			optional iwn4965fw | iwnfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu" \
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwn4965.fw"
@@ -242,8 +243,8 @@
 -	no-implicit-rule						\
 -	clean		"iwn5000fw.fwo"
 -iwn5000.fw			optional iwn5000fw | iwnfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu"	\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"iwn5000.fw"
 -iwn5150fw.c			optional iwn5150fw | iwnfw		\
@@ -256,7 +257,7 @@
 -	no-implicit-rule						\
 -	clean		"iwn5150fw.fwo"
 -iwn5150.fw			optional iwn5150fw | iwnfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu"\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwn5150.fw"
@@ -270,10 +271,38 @@
 -	no-implicit-rule						\
 -	clean		"iwn6000fw.fwo"
 -iwn6000.fw			optional iwn6000fw | iwnfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"iwn6000.fw"
+-iwn6000g2afw.c			optional iwn6000g2afw | iwnfw		\
+-	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2a.fw:iwn6000g2afw -miwn6000g2afw -c${.TARGET}" \
+-	no-implicit-rule before-depend local				\
+-	clean		"iwn6000g2afw.c"
+-iwn6000g2afw.fwo		optional iwn6000g2afw | iwnfw		\
+-	dependency	"iwn6000g2a.fw"					\
+-	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn6000g2a.fw" \
+-	no-implicit-rule						\
+-	clean		"iwn6000g2afw.fwo"
+-iwn6000g2a.fw			optional iwn6000g2afw | iwnfw		\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
+-	no-obj no-implicit-rule						\
+-	clean		"iwn6000g2a.fw"
+-iwn6000g2bfw.c			optional iwn6000g2bfw | iwnfw		\
+-	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2b.fw:iwn6000g2bfw -miwn6000g2bfw -c${.TARGET}" \
+-	no-implicit-rule before-depend local				\
+-	clean		"iwn6000g2bfw.c"
+-iwn6000g2bfw.fwo		optional iwn6000g2bfw | iwnfw		\
+-	dependency	"iwn6000g2b.fw"					\
+-	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn6000g2b.fw" \
+-	no-implicit-rule						\
+-	clean		"iwn6000g2bfw.fwo"
+-iwn6000g2b.fw			optional iwn6000g2bfw | iwnfw		\
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
+-	no-obj no-implicit-rule						\
+-	clean		"iwn6000g2b.fw"
 -iwn6050fw.c			optional iwn6050fw | iwnfw		\
 -	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6050.fw:iwn6050fw -miwn6050fw -c${.TARGET}" \
 -	no-implicit-rule before-depend local				\
@@ -284,17 +313,20 @@
 -	no-implicit-rule						\
 -	clean		"iwn6050fw.fwo"
 -iwn6050.fw			optional iwn6050fw | iwnfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu" \
+-	dependency	"$S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
+-	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
 -	no-obj no-implicit-rule						\
--	clean		"iwn6000.fw"
+-	clean		"iwn6050.fw"
  dev/ixgb/if_ixgb.c		optional ixgb
  dev/ixgb/ixgb_ee.c		optional ixgb
  dev/ixgb/ixgb_hw.c		optional ixgb
-@@ -1315,30 +1084,6 @@
- dev/mwl/if_mwl.c		optional mwl
- dev/mwl/if_mwl_pci.c		optional mwl pci
- dev/mwl/mwlhal.c		optional mwl
+@@ -1474,33 +1213,6 @@
+ dev/mvs/mvs.c			optional mvs
+ dev/mvs/mvs_if.m		optional mvs
+ dev/mvs/mvs_pci.c		optional mvs pci
+-dev/mwl/if_mwl.c		optional mwl
+-dev/mwl/if_mwl_pci.c		optional mwl pci
+-dev/mwl/mwlhal.c		optional mwl
 -mwlfw.c				optional mwlfw				\
 -	compile-with	"${AWK} -f $S/tools/fw_stub.awk mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot -mmwl -c${.TARGET}" \
 -	no-implicit-rule before-depend local				\
@@ -305,7 +337,7 @@
 -	no-implicit-rule						\
 -	clean		"mw88W8363.fwo"
 -mw88W8363.fw		optional mwlfw					\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/mwl/mw88W8363.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/mwl/mw88W8363.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"mw88W8363.fw"
@@ -315,17 +347,20 @@
 -	no-implicit-rule						\
 -	clean		"mwlboot.fwo"
 -mwlboot.fw		optional mwlfw					\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/mwl/mwlboot.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/mwl/mwlboot.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"mwlboot.fw"
  dev/mxge/if_mxge.c		optional mxge pci
  dev/mxge/mxge_lro.c		optional mxge pci
  dev/mxge/mxge_eth_z8e.c		optional mxge pci
-@@ -1429,62 +1174,6 @@
- dev/ral/rt2560.c		optional ral
- dev/ral/rt2661.c		optional ral
- dev/ral/if_ral_pci.c		optional ral pci
+@@ -1589,65 +1301,6 @@
+ dev/puc/puc_pci.c		optional puc pci
+ dev/puc/pucdata.c		optional puc pci
+ dev/quicc/quicc_core.c		optional quicc
+-dev/ral/rt2560.c		optional ral
+-dev/ral/rt2661.c		optional ral
+-dev/ral/if_ral_pci.c		optional ral pci
 -rt2561fw.c			optional rt2561fw | ralfw		\
 -	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
 -	no-implicit-rule before-depend local				\
@@ -336,7 +371,7 @@
 -	no-implicit-rule						\
 -	clean		"rt2561fw.fwo"
 -rt2561.fw			optional rt2561fw | ralfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ral/rt2561.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
 -	no-obj no-implicit-rule						\
 -	clean		"rt2561.fw"
@@ -350,7 +385,7 @@
 -	no-implicit-rule						\
 -	clean		"rt2561sfw.fwo"
 -rt2561s.fw			optional rt2561sfw | ralfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ral/rt2561s.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"rt2561s.fw"
@@ -364,7 +399,7 @@
 -	no-implicit-rule						\
 -	clean		"rt2661fw.fwo"
 -rt2661.fw			optional rt2661fw | ralfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ral/rt2661.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"rt2661.fw"
@@ -378,14 +413,14 @@
 -	no-implicit-rule						\
 -	clean		"rt2860fw.fwo"
 -rt2860.fw			optional rt2860fw | ralfw		\
--	dependency	".PHONY"					\
+-	dependency	"$S/contrib/dev/ral/rt2860.fw.uu"		\
 -	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu"	\
 -	no-obj no-implicit-rule						\
 -	clean		"rt2860.fw"
  dev/random/harvest.c		standard
  dev/random/hash.c		optional random
  dev/random/probe.c		optional random
-@@ -1509,14 +1198,7 @@
+@@ -1672,14 +1325,7 @@
  dev/scd/scd.c			optional scd isa
  dev/scd/scd_isa.c		optional scd isa
  dev/sdhci/sdhci.c		optional sdhci pci
@@ -400,7 +435,7 @@
  dev/siba/siba_bwn.c		optional siba_bwn pci
  dev/siba/siba_core.c		optional siba_bwn pci
  dev/siis/siis.c			optional siis pci
-@@ -1527,9 +1209,6 @@
+@@ -1690,9 +1336,6 @@
  dev/smbus/smbus.c		optional smbus
  dev/smbus/smbus_if.m		optional smbus
  dev/smc/if_smc.c		optional smc
@@ -410,7 +445,7 @@
  dev/snp/snp.c			optional snp
  dev/sound/clone.c		optional sound
  dev/sound/unit.c		optional sound
-@@ -1545,10 +1224,6 @@
+@@ -1708,10 +1351,6 @@
  dev/sound/pci/atiixp.c		optional snd_atiixp pci
  dev/sound/pci/cmi.c		optional snd_cmi pci
  dev/sound/pci/cs4281.c		optional snd_cs4281 pci
@@ -421,7 +456,7 @@
  dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci \
  	dependency "emu10k1-alsa%diked.h" \
  	warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1571,8 +1246,6 @@
+@@ -1734,8 +1373,6 @@
  dev/sound/pci/fm801.c		optional snd_fm801 pci
  dev/sound/pci/ich.c		optional snd_ich pci
  dev/sound/pci/maestro.c		optional snd_maestro pci
@@ -430,7 +465,7 @@
  dev/sound/pci/neomagic.c	optional snd_neomagic pci
  dev/sound/pci/solo.c		optional snd_solo pci
  dev/sound/pci/spicds.c		optional snd_spicds pci
-@@ -1652,7 +1325,6 @@
+@@ -1815,7 +1452,6 @@
  dev/syscons/warp/warp_saver.c	optional warp_saver
  dev/tdfx/tdfx_linux.c		optional tdfx_linux tdfx compat_linux
  dev/tdfx/tdfx_pci.c		optional tdfx pci
@@ -438,28 +473,37 @@
  dev/tl/if_tl.c			optional tl pci
  dev/trm/trm.c			optional trm
  dev/twa/tw_cl_init.c		optional twa \
-@@ -1670,7 +1342,6 @@
+@@ -1833,7 +1469,6 @@
  dev/twe/twe.c			optional twe
  dev/twe/twe_freebsd.c		optional twe
  dev/tx/if_tx.c			optional tx
--dev/txp/if_txp.c		optional txp inet
+-dev/txp/if_txp.c		optional txp
  dev/uart/uart_bus_acpi.c	optional uart acpi
  #dev/uart/uart_bus_cbus.c	optional uart cbus
  dev/uart/uart_bus_ebus.c	optional uart ebus
-@@ -1748,7 +1419,6 @@
+@@ -1913,17 +1548,15 @@
  dev/usb/net/if_cdce.c		optional cdce
  dev/usb/net/if_cue.c		optional cue
  dev/usb/net/if_ipheth.c		optional ipheth
 -dev/usb/net/if_kue.c		optional kue
+ dev/usb/net/if_mos.c		optional mos
  dev/usb/net/if_rue.c		optional rue
  dev/usb/net/if_udav.c		optional udav
- dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | kue | rue | \
-@@ -1757,13 +1427,10 @@
+-dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | kue | mos | \
++dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | mos | \
+ 					 rue | udav
+ dev/usb/net/uhso.c		optional uhso
  #
  # USB WLAN drivers
  #
 -dev/usb/wlan/if_rum.c		optional rum
  dev/usb/wlan/if_run.c		optional run
+ runfw.c				optional runfw							\
+ 	compile-with	"${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}"	\
+@@ -1939,11 +1572,9 @@
+ 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu"		\
+ 	no-obj no-implicit-rule									\
+ 	clean		"runfw"
 -dev/usb/wlan/if_uath.c		optional uath
  dev/usb/wlan/if_upgt.c		optional upgt
  dev/usb/wlan/if_ural.c		optional ural
@@ -470,7 +514,7 @@
  #
 --- a/sys/conf/files.i386
 +++ b/sys/conf/files.i386
-@@ -120,17 +120,9 @@
+@@ -121,17 +121,9 @@
  dev/atkbdc/atkbdc_isa.c		optional atkbdc isa
  dev/atkbdc/atkbdc_subr.c	optional atkbdc
  dev/atkbdc/psm.c		optional psm atkbdc
@@ -499,26 +543,26 @@
 -	radeon \
  	savage \
  	sis \
- 	tdfx
+ 	tdfx \
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -36,7 +36,6 @@
- 	ata \
+@@ -37,7 +37,6 @@
  	ath \
+ 	ath_pci \
  	${_auxio} \
--	${_bce} \
+-	bce \
  	bfe \
  	bge \
- 	${_bios} \
-@@ -53,7 +52,6 @@
- 	${_cbb} \
+ 	${_bxe} \
+@@ -56,7 +55,6 @@
+ 	cc \
  	cd9660 \
  	cd9660_iconv \
 -	${_ce} \
  	${_ciss} \
  	${_cm} \
  	${_cmx} \
-@@ -61,14 +59,11 @@
+@@ -64,14 +62,11 @@
  	coda5 \
  	${_coff} \
  	${_coretemp} \
@@ -530,10 +574,10 @@
  	${_cs} \
 -	${_ctau} \
 -	${_cxgb} \
+ 	cxgbe \
  	${_cyclic} \
  	dc \
- 	dcons \
-@@ -89,13 +84,11 @@
+@@ -93,13 +88,11 @@
  	${_ex} \
  	${_exca} \
  	${_ext2fs} \
@@ -546,8 +590,8 @@
 -	fxp \
  	gem \
  	geom \
- 	${_glxsb} \
-@@ -135,14 +128,10 @@
+ 	${_glxiic} \
+@@ -140,14 +133,10 @@
  	ip_mroute_mod \
  	${_ips} \
  	${_ipw} \
@@ -562,16 +606,16 @@
  	${_ixgb} \
  	${_ixgbe} \
  	jme \
-@@ -191,7 +180,6 @@
- 	msk \
+@@ -202,7 +191,6 @@
+ 	${_mthca} \
  	mvs \
  	mwl \
 -	mwlfw \
  	mxge \
  	my \
  	${_ncp} \
-@@ -237,14 +225,12 @@
- 	${_pst} \
+@@ -249,14 +237,12 @@
+ 	pty  \
  	puc \
  	ral \
 -	ralfw \
@@ -585,15 +629,15 @@
  	${_s3} \
  	${_safe} \
  	${_sbni} \
-@@ -253,7 +239,6 @@
- 	${_scsi_low} \
+@@ -266,7 +252,6 @@
  	sdhci \
  	sem \
+ 	send \
 -	sf \
  	sge \
- 	${_siba_bwn} \
+ 	siba_bwn \
  	siftr \
-@@ -261,7 +246,6 @@
+@@ -274,7 +259,6 @@
  	sis \
  	sk \
  	${_smbfs} \
@@ -601,23 +645,23 @@
  	${_snc} \
  	snp \
  	${_sound} \
-@@ -276,7 +260,6 @@
+@@ -289,7 +273,6 @@
  	${_sym} \
  	${_syscons} \
  	sysvipc \
 -	ti \
  	tl \
- 	${_tmpfs} \
+ 	tmpfs \
  	${_tpm} \
-@@ -284,7 +267,6 @@
+@@ -297,7 +280,6 @@
  	${_twa} \
  	twe \
  	tx \
 -	txp \
- 	${_uart} \
+ 	uart \
  	ubsec \
  	udf \
-@@ -310,7 +292,6 @@
+@@ -324,7 +306,6 @@
  	wlan_wep \
  	wlan_xauth \
  	${_wpi} \
@@ -625,8 +669,8 @@
  	${_x86bios} \
  	${_xe} \
  	xfs \
-@@ -376,9 +357,7 @@
- _bktr=		bktr
+@@ -393,9 +374,7 @@
+ _bxe=		bxe
  _cardbus=	cardbus
  _cbb=		cbb
 -_ce=		ce
@@ -635,7 +679,7 @@
  _cpuctl=	cpuctl
  _cpufreq=	cpufreq
  _cs=		cs
-@@ -470,11 +449,8 @@
+@@ -493,11 +472,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -647,7 +691,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _mly=		mly
-@@ -483,7 +459,6 @@
+@@ -506,7 +482,6 @@
  _nxge=		nxge
  _tpm=		tpm
  _wpi=		wpi
@@ -655,7 +699,7 @@
  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
  _padlock=	padlock
  .endif
-@@ -542,11 +517,8 @@
+@@ -567,11 +542,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -667,7 +711,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _lindev=	lindev
-@@ -581,7 +553,6 @@
+@@ -611,7 +583,6 @@
  _x86bios=	x86bios
  _wi=		wi
  _wpi=		wpi
@@ -694,12 +738,12 @@
  SUBDIR = usb
  SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
 -SUBDIR += rum run uath upgt ural zyd ${_urtw}
-+SUBDIR += run uath upgt ural ${_urtw}
- SUBDIR += atp uhid ukbd ums udbp ufm
++SUBDIR += run upgt ural ${_urtw}
+ SUBDIR += atp uhid ukbd ums udbp ufm uep
  SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
- 	  umct umodem umoscom uplcom uslcom uvisor uvscom
--SUBDIR += uether aue axe cdce cue kue rue udav uhso ipheth
-+SUBDIR += uether aue axe cdce cue rue udav uhso ipheth
+ 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
+-SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth
++SUBDIR += uether aue axe cdce cue mos rue udav uhso ipheth
  SUBDIR += usfs umass urio
  SUBDIR += quirk template
  

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/patches/series	2011-06-15 17:44:34 UTC (rev 3444)
@@ -12,7 +12,7 @@
 103_stat_pipe.diff
 #105_apm_amd64.diff
 #106_teken_op.diff
-107_mount_update.diff
+#107_mount_update.diff
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
@@ -32,5 +32,6 @@
 916_NKPT_amd64.diff
 #917_track_alignment.diff
 950_no_stack_protector.diff
+951_disable_mk_magic.diff
 999_config.diff
-#999_firmware.diff
+999_firmware.diff

Modified: trunk/kfreebsd-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-06-15 12:28:16 UTC (rev 3443)
+++ trunk/kfreebsd-9/debian/rules	2011-06-15 17:44:34 UTC (rev 3444)
@@ -9,6 +9,7 @@
 
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
 tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
 version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
@@ -45,7 +46,7 @@
 get-orig-source:
 	rm -rf $(ORIG_DIR)
 	for i in sys usr.sbin/config ; do \
-		svn export $(SVN)/$$i $(ORIG_DIR)/$$i ; \
+		svn export -r $(svn_revision) $(SVN)/$$i $(ORIG_DIR)/$$i ; \
 	done
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(ORIG_TAR) $(ORIG_DIR)

More information about the Glibc-bsd-commits mailing list