[Glibc-bsd-commits] r4143 - in trunk/kfreebsd-8/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Mar 10 20:55:37 UTC 2012


Author: rmh
Date: 2012-03-10 20:55:36 +0000 (Sat, 10 Mar 2012)
New Revision: 4143

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
   trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff
   trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
   trunk/kfreebsd-8/debian/patches/999_config.diff
   trunk/kfreebsd-8/debian/patches/999_firmware.diff
   trunk/kfreebsd-8/debian/rules
Log:
New upstream snapshot

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/changelog	2012-03-10 20:55:36 UTC (rev 4143)
@@ -1,5 +1,8 @@
-kfreebsd-8 (8.3~svn230343-2) UNRELEASED; urgency=low
+kfreebsd-8 (8.3~svn232634-1) experimental; urgency=low
 
+  * New upstream snapshot.
+
+  [ Robert Millan ]
   * Enable pflog.  (Closes: #658677)
 
  -- Robert Millan <rmh at debian.org>  Fri, 10 Feb 2012 23:39:57 +0100

Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff	2012-03-10 20:55:36 UTC (rev 4143)
@@ -1,6 +1,6 @@
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -145,8 +145,6 @@
+@@ -146,8 +146,6 @@
  device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options
@@ -20,7 +20,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -224,7 +222,6 @@
+@@ -225,7 +223,6 @@
  	ntfs \
  	ntfs_iconv \
  	nullfs \
@@ -28,7 +28,7 @@
  	${_nvram} \
  	${_nwfs} \
  	${_nxge} \
-@@ -483,10 +480,7 @@
+@@ -485,10 +482,7 @@
  _ctau=		ctau
  _dpt=		dpt
  _ex=		ex
@@ -39,7 +39,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -502,7 +496,6 @@
+@@ -505,7 +499,6 @@
  _ixgbe=		ixgbe
  _mly=		mly
  _nfe=		nfe
@@ -47,7 +47,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _tpm=		tpm
-@@ -556,10 +549,7 @@
+@@ -559,10 +552,7 @@
  _em=		em
  _exca=		exca
  _ext2fs=	ext2fs
@@ -58,7 +58,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -584,7 +574,6 @@
+@@ -588,7 +578,6 @@
  _mly=		mly
  _ndis=		ndis
  _nfe=		nfe
@@ -68,7 +68,7 @@
  .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 --- a/sys/amd64/conf/GENERIC
 +++ b/sys/amd64/conf/GENERIC
-@@ -139,8 +139,6 @@
+@@ -140,8 +140,6 @@
  #device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
  device		ciss		# Compaq Smart RAID 5*
  device		dpt		# DPT Smartcache III, IV - See NOTES for options

Modified: trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff	2012-03-10 20:55:36 UTC (rev 4143)
@@ -4,7 +4,7 @@
 
 --- a/sys/netinet6/in6_proto.c
 +++ b/sys/netinet6/in6_proto.c
-@@ -394,7 +394,7 @@
+@@ -385,7 +385,7 @@
  VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
  VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
  VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -13,7 +13,7 @@
  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;
-@@ -407,7 +407,7 @@
+@@ -398,7 +398,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-8/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/patches/917_disable_kgssapi.diff	2012-03-10 20:55:36 UTC (rev 4143)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -152,8 +152,6 @@
+@@ -153,8 +153,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff	2012-03-10 20:55:36 UTC (rev 4143)
@@ -13,7 +13,7 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -123,6 +123,8 @@
+@@ -124,6 +124,8 @@
  #
  # GCC SSP support.
  #

Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff	2012-03-10 20:55:36 UTC (rev 4143)
@@ -73,8 +73,8 @@
 -device		adw		# Advansys wide SCSI adapters
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
- 
-@@ -189,10 +187,6 @@
+ device		isci		# Intel C600 SAS controller
+@@ -190,10 +188,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -85,7 +85,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -202,8 +196,6 @@
+@@ -203,8 +197,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
@@ -94,7 +94,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -213,12 +205,10 @@
+@@ -214,12 +206,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -107,7 +107,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 +218,6 @@
+@@ -229,7 +219,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -115,7 +115,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 +237,6 @@
+@@ -249,7 +238,6 @@
  device		ex		# Intel EtherExpress Pro/10 and Pro/10+
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
@@ -123,7 +123,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -273,11 +261,8 @@
+@@ -274,11 +262,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -135,7 +135,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -291,35 +276,9 @@
+@@ -292,35 +277,9 @@
  device		ohci		# OHCI PCI->USB interface
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		usb		# USB Bus (required)
@@ -171,7 +171,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -328,3 +287,11 @@
+@@ -329,3 +288,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
@@ -267,7 +267,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
-@@ -199,10 +199,6 @@
+@@ -200,10 +200,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -278,7 +278,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -212,8 +208,6 @@
+@@ -213,8 +209,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
@@ -287,7 +287,7 @@
  device		vx		# 3Com 3c590, 3c595 (``Vortex'')
  
  # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -223,12 +217,10 @@
+@@ -224,12 +218,10 @@
  device		age		# Attansic/Atheros L1 Gigabit Ethernet
  device		alc		# Atheros AR8131/AR8132 Ethernet
  device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@@ -300,7 +300,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 +230,6 @@
+@@ -239,7 +231,6 @@
  device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
  device		re		# RealTek 8139C+/8169/8169S/8110S
  device		rl		# RealTek 8129/8139
@@ -308,7 +308,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 +251,6 @@
+@@ -261,7 +252,6 @@
  device		ep		# Etherlink III based cards
  device		fe		# Fujitsu MB8696x based cards
  device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -316,7 +316,7 @@
  device		xe		# Xircom pccard Ethernet
  
  # Wireless NIC cards
-@@ -286,11 +276,8 @@
+@@ -287,11 +277,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -328,7 +328,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -304,36 +291,9 @@
+@@ -305,36 +292,9 @@
  device		ohci		# OHCI PCI->USB interface
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		usb		# USB Bus (required)
@@ -365,7 +365,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -342,3 +302,11 @@
+@@ -343,3 +303,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

Modified: trunk/kfreebsd-8/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_firmware.diff	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/patches/999_firmware.diff	2012-03-10 20:55:36 UTC (rev 4143)
@@ -1,518 +1,6 @@
 
 See #594940  
 
----
- sys/conf/files                    |  333 --------------------------------------
- sys/conf/files.i386               |    8 
- sys/modules/Makefile              |   29 ---
- sys/modules/drm/Makefile          |    3 
- sys/modules/sound/driver/Makefile |    4 
- sys/modules/usb/Makefile          |    4 
- 6 files changed, 4 insertions(+), 377 deletions(-)
-
---- a/sys/conf/files
-+++ b/sys/conf/files
-@@ -462,10 +462,6 @@
- dev/advansys/advansys.c		optional adv
- dev/advansys/advlib.c		optional adv
- dev/advansys/advmcode.c		optional adv
--dev/advansys/adw_pci.c		optional adw pci
--dev/advansys/adwcam.c		optional adw
--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/agp/agp.c			optional agp pci
-@@ -758,7 +754,6 @@
- dev/ath/ath_rate/sample/sample.c	optional ath_rate_sample \
- 	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,42 +789,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
--dev/cxgb/cxgb_main.c		optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/cxgb_offload.c		optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/cxgb_sge.c		optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_mc5.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_aq100x.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"
--dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgb"	
--dev/cxgb/sys/uipc_mvec.c	optional cxgb pci \
--	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/cxgbe/t4_main.c		optional cxgbe pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
--dev/cxgbe/t4_sge.c		optional cxgbe pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
--dev/cxgbe/t4_l2t.c		optional cxgbe pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
--dev/cxgbe/common/t4_hw.c	optional cxgbe pci \
--	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
- dev/cy/cy.c			optional cy
- dev/cy/cy_isa.c			optional cy isa
- dev/cy/cy_pci.c			optional cy pci
-@@ -840,13 +799,6 @@
- dev/dcons/dcons_crom.c		optional dcons_crom
- dev/dcons/dcons_os.c		optional dcons
- dev/de/if_de.c			optional de pci
--dev/digi/CX.c			optional digi_CX
--dev/digi/CX_PCI.c		optional digi_CX_PCI
--dev/digi/EPCX.c			optional digi_EPCX
--dev/digi/EPCX_PCI.c		optional digi_EPCX_PCI
--dev/digi/Xe.c			optional digi_Xe
--dev/digi/Xem.c			optional digi_Xem
--dev/digi/Xr.c			optional digi_Xr
- dev/digi/digi.c			optional digi
- dev/digi/digi_isa.c		optional digi isa
- dev/digi/digi_pci.c		optional digi pci
-@@ -879,26 +831,6 @@
- dev/drm/mach64_drv.c		optional mach64drm
- dev/drm/mach64_irq.c		optional mach64drm
- dev/drm/mach64_state.c		optional mach64drm
--dev/drm/mga_dma.c		optional mgadrm
--dev/drm/mga_drv.c		optional mgadrm
--dev/drm/mga_irq.c		optional mgadrm
--dev/drm/mga_state.c		optional mgadrm \
--	compile-with "${NORMAL_C} -finline-limit=13500"
--dev/drm/mga_warp.c		optional mgadrm
--dev/drm/r128_cce.c		optional r128drm
--dev/drm/r128_drv.c		optional r128drm
--dev/drm/r128_irq.c		optional r128drm
--dev/drm/r128_state.c		optional r128drm \
--	compile-with "${NORMAL_C} -finline-limit=13500"
--dev/drm/r300_cmdbuf.c		optional radeondrm
--dev/drm/r600_blit.c		optional radeondrm
--dev/drm/r600_cp.c		optional radeondrm
--dev/drm/radeon_cp.c		optional radeondrm
--dev/drm/radeon_cs.c		optional radeondrm
--dev/drm/radeon_drv.c		optional radeondrm
--dev/drm/radeon_irq.c		optional radeondrm
--dev/drm/radeon_mem.c		optional radeondrm
--dev/drm/radeon_state.c		optional radeondrm
- dev/drm/savage_bci.c		optional savagedrm
- dev/drm/savage_drv.c		optional savagedrm
- dev/drm/savage_state.c		optional savagedrm
-@@ -981,7 +913,6 @@
- dev/firewire/sbp.c		optional sbp
- dev/firewire/sbp_targ.c		optional sbp_targ
- dev/flash/at45d.c		optional at45d
--dev/fxp/if_fxp.c		optional fxp inet
- 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
-@@ -1031,48 +962,6 @@
- dev/ips/ips_ioctl.c		optional ips
- dev/ips/ips_pci.c		optional ips pci
- 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				\
--	clean		"ipwbssfw.c"
--ipw_bss.fwo			optional ipwbssfw | ipwfw		\
--	dependency	"ipw_bss.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
--	no-implicit-rule						\
--	clean		"ipw_bss.fwo"
--ipw_bss.fw			optional ipwbssfw | ipwfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
--	no-obj no-implicit-rule						\
--	clean		"ipw_bss.fw"
--ipwibssfw.c			optional ipwibssfw | ipwfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"ipwibssfw.c"
--ipw_ibss.fwo			optional ipwibssfw | ipwfw		\
--	dependency	"ipw_ibss.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
--	no-implicit-rule						\
--	clean		"ipw_ibss.fwo"
--ipw_ibss.fw			optional ipwibssfw | ipwfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
--	no-obj no-implicit-rule						\
--	clean		"ipw_ibss.fw"
--ipwmonitorfw.c			optional ipwmonitorfw | ipwfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"ipwmonitorfw.c"
--ipw_monitor.fwo			optional ipwmonitorfw | ipwfw		\
--	dependency	"ipw_monitor.fw"				\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
--	no-implicit-rule						\
--	clean		"ipw_monitor.fwo"
--ipw_monitor.fw			optional ipwmonitorfw | ipwfw		\
--	dependency	".PHONY"					\
--	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
-@@ -1085,163 +974,7 @@
- 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
--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				\
--	clean		"iwibssfw.c"
--iwi_bss.fwo			optional iwibssfw | iwifw		\
--	dependency	"iwi_bss.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
--	no-implicit-rule						\
--	clean		"iwi_bss.fwo"
--iwi_bss.fw			optional iwibssfw | iwifw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
--	no-obj no-implicit-rule						\
--	clean		"iwi_bss.fw"
--iwiibssfw.c			optional iwiibssfw | iwifw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwiibssfw.c"
--iwi_ibss.fwo			optional iwiibssfw | iwifw		\
--	dependency	"iwi_ibss.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
--	no-implicit-rule						\
--	clean		"iwi_ibss.fwo"
--iwi_ibss.fw			optional iwiibssfw | iwifw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
--	no-obj no-implicit-rule						\
--	clean		"iwi_ibss.fw"
--iwimonitorfw.c			optional iwimonitorfw | iwifw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwimonitorfw.c"
--iwi_monitor.fwo			optional iwimonitorfw | iwifw		\
--	dependency	"iwi_monitor.fw"				\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
--	no-implicit-rule						\
--	clean		"iwi_monitor.fwo"
--iwi_monitor.fw			optional iwimonitorfw | iwifw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
--	no-obj no-implicit-rule						\
--	clean		"iwi_monitor.fw"
--dev/iwn/if_iwn.c		optional iwn
--iwn1000fw.c			optional iwn1000fw | iwnfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwn1000fw.c"
--iwn1000fw.fwo			optional iwn1000fw | iwnfw		\
--	dependency	"iwn1000.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn1000.fw" \
--	no-implicit-rule						\
--	clean		"iwn1000fw.fwo"
--iwn1000.fw			optional iwn1000fw | iwnfw		\
--	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		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwn4965fw.c"
--iwn4965fw.fwo			optional iwn4965fw | iwnfw		\
--	dependency	"iwn4965.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn4965.fw" \
--	no-implicit-rule						\
--	clean		"iwn4965fw.fwo"
--iwn4965.fw			optional iwn4965fw | iwnfw		\
--	dependency	".PHONY"					\
--	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"
--iwn5000fw.c			optional iwn5000fw | iwnfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn5000.fw:iwn5000fw -miwn5000fw -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwn5000fw.c"
--iwn5000fw.fwo		optional iwn5000fw | iwnfw			\
--	dependency	"iwn5000.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn5000.fw" \
--	no-implicit-rule						\
--	clean		"iwn5000fw.fwo"
--iwn5000.fw			optional iwn5000fw | iwnfw		\
--	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		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn5150.fw:iwn5150fw -miwn5150fw -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwn5150fw.c"
--iwn5150fw.fwo			optional iwn5150fw | iwnfw		\
--	dependency	"iwn5150.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn5150.fw" \
--	no-implicit-rule						\
--	clean		"iwn5150fw.fwo"
--iwn5150.fw			optional iwn5150fw | iwnfw		\
--	dependency	".PHONY"					\
--	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"
--iwn6000fw.c			optional iwn6000fw | iwnfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000.fw:iwn6000fw -miwn6000fw -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"iwn6000fw.c"
--iwn6000fw.fwo			optional iwn6000fw | iwnfw		\
--	dependency	"iwn6000.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn6000.fw" \
--	no-implicit-rule						\
--	clean		"iwn6000fw.fwo"
--iwn6000.fw			optional iwn6000fw | iwnfw		\
--	dependency	".PHONY"					\
--	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				\
--	clean		"iwn6050fw.c"
--iwn6050fw.fwo			optional iwn6050fw | iwnfw		\
--	dependency	"iwn6050.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn6050.fw" \
--	no-implicit-rule						\
--	clean		"iwn6050fw.fwo"
--iwn6050.fw			optional iwn6050fw | iwnfw		\
--	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		"iwn6050.fw"
- dev/ixgb/if_ixgb.c		optional ixgb
- dev/ixgb/ixgb_ee.c		optional ixgb
- dev/ixgb/ixgb_hw.c		optional ixgb
-@@ -1362,30 +1095,6 @@
- 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				\
--	clean		"mwlfw.c"
--mw88W8363.fwo		optional mwlfw					\
--	dependency	"mw88W8363.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} mw88W8363.fw" \
--	no-implicit-rule						\
--	clean		"mw88W8363.fwo"
--mw88W8363.fw		optional mwlfw					\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/mwl/mw88W8363.fw.uu"	\
--	no-obj no-implicit-rule						\
--	clean		"mw88W8363.fw"
--mwlboot.fwo		optional mwlfw					\
--	dependency	"mwlboot.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} mwlboot.fw" \
--	no-implicit-rule						\
--	clean		"mwlboot.fwo"
--mwlboot.fw		optional mwlfw					\
--	dependency	".PHONY"					\
--	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
-@@ -1476,62 +1185,6 @@
- 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				\
--	clean		"rt2561fw.c"
--rt2561fw.fwo			optional rt2561fw | ralfw		\
--	dependency	"rt2561.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
--	no-implicit-rule						\
--	clean		"rt2561fw.fwo"
--rt2561.fw			optional rt2561fw | ralfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
--	no-obj no-implicit-rule						\
--	clean		"rt2561.fw"
--rt2561sfw.c			optional rt2561sfw | ralfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"rt2561sfw.c"
--rt2561sfw.fwo			optional rt2561sfw | ralfw		\
--	dependency	"rt2561s.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
--	no-implicit-rule						\
--	clean		"rt2561sfw.fwo"
--rt2561s.fw			optional rt2561sfw | ralfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu"	\
--	no-obj no-implicit-rule						\
--	clean		"rt2561s.fw"
--rt2661fw.c			optional rt2661fw | ralfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"rt2661fw.c"
--rt2661fw.fwo			optional rt2661fw | ralfw		\
--	dependency	"rt2661.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
--	no-implicit-rule						\
--	clean		"rt2661fw.fwo"
--rt2661.fw			optional rt2661fw | ralfw		\
--	dependency	".PHONY"					\
--	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu"	\
--	no-obj no-implicit-rule						\
--	clean		"rt2661.fw"
--rt2860fw.c			optional rt2860fw | ralfw		\
--	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
--	no-implicit-rule before-depend local				\
--	clean		"rt2860fw.c"
--rt2860fw.fwo			optional rt2860fw | ralfw		\
--	dependency	"rt2860.fw"					\
--	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
--	no-implicit-rule						\
--	clean		"rt2860fw.fwo"
--rt2860.fw			optional rt2860fw | ralfw		\
--	dependency	".PHONY"					\
--	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
-@@ -1556,14 +1209,7 @@
- dev/scd/scd.c			optional scd isa
- dev/scd/scd_isa.c		optional scd isa
- dev/sdhci/sdhci.c		optional sdhci pci
--dev/sf/if_sf.c			optional sf pci
- dev/sge/if_sge.c		optional sge pci
--dev/si/si.c			optional si
--dev/si/si2_z280.c		optional si
--dev/si/si3_t225.c		optional si
--dev/si/si_eisa.c		optional si eisa
--dev/si/si_isa.c			optional si isa
--dev/si/si_pci.c			optional si pci
- 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
-@@ -1574,9 +1220,6 @@
- dev/smbus/smbus.c		optional smbus
- dev/smbus/smbus_if.m		optional smbus
- dev/smc/if_smc.c		optional smc
--dev/sn/if_sn.c			optional sn
--dev/sn/if_sn_isa.c		optional sn isa
--dev/sn/if_sn_pccard.c		optional sn pccard
- dev/snp/snp.c			optional snp
- dev/sound/clone.c		optional sound
- dev/sound/unit.c		optional sound
-@@ -1592,10 +1235,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
--dev/sound/pci/csa.c		optional snd_csa pci \
--	warning "kernel contains GPL contaminated csaimg.h header"
--dev/sound/pci/csapcm.c		optional snd_csa pci
--dev/sound/pci/ds1.c		optional snd_ds1 pci
- dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci \
- 	dependency "emu10k1-alsa%diked.h" \
- 	warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1618,8 +1257,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
--dev/sound/pci/maestro3.c	optional snd_maestro3 pci \
--	warning "kernel contains GPL contaminated maestro3 headers"
- 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
-@@ -1699,7 +1336,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
--dev/ti/if_ti.c			optional ti pci
- dev/tl/if_tl.c			optional tl pci
- dev/trm/trm.c			optional trm
- dev/twa/tw_cl_init.c		optional twa \
-@@ -1722,7 +1358,6 @@
- dev/tws/tws_services.c		optional tws
- dev/tws/tws_user.c		optional tws
- dev/tx/if_tx.c			optional tx
--dev/txp/if_txp.c		optional txp inet
- 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
-@@ -1801,7 +1436,6 @@
- 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_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 | \
-@@ -1810,13 +1444,10 @@
- #
- # USB WLAN drivers
- #
--dev/usb/wlan/if_rum.c		optional rum
- dev/usb/wlan/if_run.c		optional run
--dev/usb/wlan/if_uath.c		optional uath
- dev/usb/wlan/if_upgt.c		optional upgt
- dev/usb/wlan/if_ural.c		optional ural
- dev/usb/wlan/if_urtw.c		optional urtw
--dev/usb/wlan/if_zyd.c		optional zyd
- #
- # USB serial and parallel port drivers
- #
 --- a/sys/modules/drm/Makefile
 +++ b/sys/modules/drm/Makefile
 @@ -4,9 +4,6 @@
@@ -572,11 +60,12 @@
  	gem \
  	geom \
  	${_glxsb} \
-@@ -139,14 +132,10 @@
+@@ -139,15 +132,11 @@
  	ip_mroute_mod \
  	${_ips} \
  	${_ipw} \
 -	${_ipwfw} \
+ 	${_isci} \
  	iscsi \
  	isp \
 -	ispfw \
@@ -587,7 +76,7 @@
  	${_ixgb} \
  	${_ixgbe} \
  	jme \
-@@ -197,7 +186,6 @@
+@@ -198,7 +187,6 @@
  	msk \
  	mvs \
  	mwl \
@@ -595,7 +84,7 @@
  	mxge \
  	my \
  	${_ncp} \
-@@ -243,14 +231,12 @@
+@@ -245,14 +233,12 @@
  	${_pst} \
  	puc \
  	ral \
@@ -610,7 +99,7 @@
  	${_s3} \
  	${_safe} \
  	${_sbni} \
-@@ -259,7 +245,6 @@
+@@ -261,7 +247,6 @@
  	${_scsi_low} \
  	sdhci \
  	sem \
@@ -618,7 +107,7 @@
  	sge \
  	${_siba_bwn} \
  	siftr \
-@@ -267,7 +252,6 @@
+@@ -269,7 +254,6 @@
  	sis \
  	sk \
  	${_smbfs} \
@@ -626,7 +115,7 @@
  	${_snc} \
  	snp \
  	${_sound} \
-@@ -282,7 +266,6 @@
+@@ -284,7 +268,6 @@
  	${_sym} \
  	${_syscons} \
  	sysvipc \
@@ -634,7 +123,7 @@
  	tl \
  	${_tmpfs} \
  	${_tpm} \
-@@ -291,7 +274,6 @@
+@@ -293,7 +276,6 @@
  	twe \
  	tws \
  	tx \
@@ -642,7 +131,7 @@
  	${_uart} \
  	ubsec \
  	udf \
-@@ -319,7 +301,6 @@
+@@ -321,7 +303,6 @@
  	wlan_wep \
  	wlan_xauth \
  	${_wpi} \
@@ -650,56 +139,6 @@
  	${_x86bios} \
  	${_xe} \
  	xfs \
-@@ -391,9 +372,7 @@
- _bktr=		bktr
- _cardbus=	cardbus
- _cbb=		cbb
--_ce=		ce
- _coff=		coff
--_cp=		cp
- _cpuctl=	cpuctl
- _cpufreq=	cpufreq
- _cs=		cs
-@@ -486,11 +465,8 @@
- _ipmi=		ipmi
- _ips=		ips
- _ipw=		ipw
--_ipwfw=		ipwfw
- _iwi=		iwi
--_iwifw=		iwifw
- _iwn=		iwn
--_iwnfw=		iwnfw
- _ixgb=		ixgb
- _ixgbe=		ixgbe
- _mly=		mly
-@@ -500,7 +476,6 @@
- _tpm=		tpm
- _viawd=		viawd
- _wpi=		wpi
--_wpifw=		wpifw
- .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
- _padlock=	padlock
- .endif
-@@ -560,11 +535,8 @@
- _ipmi=		ipmi
- _ips=		ips
- _ipw=		ipw
--_ipwfw=		ipwfw
- _iwi=		iwi
--_iwifw=		iwifw
- _iwn=		iwn
--_iwnfw=		iwnfw
- _ixgb=		ixgb
- _ixgbe=		ixgbe
- _lindev=	lindev
-@@ -600,7 +572,6 @@
- _x86bios=	x86bios
- _wi=		wi
- _wpi=		wpi
--_wpifw=		wpifw
- .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
- _zfs=		zfs
- .endif
 --- a/sys/modules/sound/driver/Makefile
 +++ b/sys/modules/sound/driver/Makefile
 @@ -1,7 +1,7 @@

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2012-03-09 21:58:19 UTC (rev 4142)
+++ trunk/kfreebsd-8/debian/rules	2012-03-10 20:55:36 UTC (rev 4143)
@@ -30,8 +30,8 @@
 endif
 
 #SVN		:= http://svn.freebsd.org/base/release/$(version).0
-#SVN		:= http://svn.freebsd.org/base/releng/$(version)
-SVN		:= http://svn.freebsd.org/base/stable/$(major)
+SVN		:= http://svn.freebsd.org/base/releng/$(version)
+#SVN		:= http://svn.freebsd.org/base/stable/$(major)
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)




More information about the Glibc-bsd-commits mailing list