[Glibc-bsd-commits] r3838 - in trunk/kfreebsd-9/debian: . patches
Robert Millan
rmh at alioth.debian.org
Wed Nov 9 19:51:14 UTC 2011
Author: rmh
Date: 2011-11-09 19:51:13 +0000 (Wed, 09 Nov 2011)
New Revision: 3838
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
trunk/kfreebsd-9/debian/patches/999_config.diff
trunk/kfreebsd-9/debian/patches/999_firmware.diff
Log:
New upstream snapshot
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/changelog 2011-11-09 19:51:13 UTC (rev 3838)
@@ -1,11 +1,14 @@
-kfreebsd-9 (9.0~svn226626-3) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn227337-1) experimental; urgency=low
+ * New upstream snapshot.
+
+ [ Robert Millan ]
* Remove gen-ld-u-options / 020_linker.diff kludge, not needed since
upstream fixed this (r215137).
* Mark kfreebsd-headers- at version@- at abiname@ as kfreebsd-any.
* Depend on package providing devd.
- -- Robert Millan <rmh at debian.org> Tue, 08 Nov 2011 21:52:33 +0100
+ -- Robert Millan <rmh at debian.org> Wed, 09 Nov 2011 19:02:17 +0100
kfreebsd-9 (9.0~svn226626-2) experimental; urgency=low
Modified: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-11-09 19:51:13 UTC (rev 3838)
@@ -53,7 +53,7 @@
dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -130,8 +130,6 @@
+@@ -132,8 +132,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
@@ -64,7 +64,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -108,8 +108,6 @@
+@@ -109,8 +109,6 @@
hifn \
hme \
${_hptiop} \
@@ -73,7 +73,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -229,7 +227,6 @@
+@@ -230,7 +228,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -81,7 +81,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -501,8 +498,6 @@
+@@ -507,8 +504,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -90,7 +90,7 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -518,7 +513,6 @@
+@@ -524,7 +519,6 @@
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
@@ -98,7 +98,7 @@
_nvram= nvram
_nxge= nxge
_tpm= tpm
-@@ -574,8 +568,6 @@
+@@ -580,8 +574,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -107,7 +107,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -606,7 +598,6 @@
+@@ -612,7 +604,6 @@
.endif
_ndis= ndis
_nfe= nfe
@@ -117,7 +117,7 @@
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -124,8 +124,6 @@
+@@ -126,8 +126,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
@@ -176,5 +176,5 @@
dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa
- dev/sio/sio.c optional sio
- dev/sio/sio_isa.c optional sio isa
+ dev/qlxgb/qla_dbg.c optional qlxgb pci
+ dev/qlxgb/qla_hw.c optional qlxgb pci
Modified: trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff 2011-11-09 19:51:13 UTC (rev 3838)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -153,8 +153,6 @@
+@@ -154,8 +154,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff 2011-11-09 19:51:13 UTC (rev 3838)
@@ -19,7 +19,7 @@
CFLAGS+= -fstack-protector
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -141,6 +141,9 @@
+@@ -144,6 +144,9 @@
CTFFLAGS+= -g
.endif
Modified: trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff 2011-11-09 19:51:13 UTC (rev 3838)
@@ -3,7 +3,7 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -359,12 +359,11 @@
+@@ -361,12 +361,11 @@
.endif
.endif
@@ -18,7 +18,16 @@
_if_carp= if_carp
.endif
-@@ -376,8 +375,7 @@
+@@ -374,7 +373,7 @@
+ _ipfilter= ipfilter
+ .endif
+
+-.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
++.if 1
+ _ipfw= ipfw
+ .endif
+
+@@ -382,11 +381,10 @@
_netgraph= netgraph
.endif
@@ -27,8 +36,12 @@
+.if 1
_pf= pf
_pflog= pflog
- .if ${MK_INET_SUPPORT} != "no"
-@@ -436,7 +434,7 @@
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ _pfsync= pfsync
+ .endif
+ .endif
+@@ -442,7 +440,7 @@
_linsysfs= linsysfs
_linux= linux
_mse= mse
@@ -37,7 +50,7 @@
_mlx4= mlx4
_mlx4ib= mlx4ib
_mlxen= mlxen
-@@ -588,7 +586,7 @@
+@@ -594,7 +592,7 @@
_linsysfs= linsysfs
_linux= linux
_mly= mly
@@ -46,3 +59,69 @@
_mlx4= mlx4
_mlx4ib= mlx4ib
_mlxen= mlxen
+--- a/sys/modules/if_carp/Makefile
++++ b/sys/modules/if_carp/Makefile
+@@ -9,7 +9,7 @@
+ SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
+
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ @echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/ipfw/Makefile
++++ b/sys/modules/ipfw/Makefile
+@@ -22,7 +22,7 @@
+ #
+
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/netgraph/ipfw/Makefile
++++ b/sys/modules/netgraph/ipfw/Makefile
+@@ -7,7 +7,7 @@
+
+ .if !defined(KERNBUILDDIR)
+
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/pf/Makefile
++++ b/sys/modules/pf/Makefile
+@@ -14,7 +14,7 @@
+ CFLAGS+= -I${.CURDIR}/../../contrib/pf
+
+ .if !defined(KERNBUILDDIR)
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/pflog/Makefile
++++ b/sys/modules/pflog/Makefile
+@@ -14,7 +14,7 @@
+ .if defined(KERNBUILDDIR)
+ MKDEP+= -include ${KERNBUILDDIR}/opt_global.h
+ .else
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ echo "#define INET 1" > ${.TARGET}
+ .endif
+--- a/sys/modules/pfsync/Makefile
++++ b/sys/modules/pfsync/Makefile
+@@ -14,7 +14,7 @@
+ .if defined(KERNBUILDDIR)
+ MKDEP+= -include ${KERNBUILDDIR}/opt_global.h
+ .else
+-.if ${MK_INET_SUPPORT} != "no"
++.if 1
+ opt_inet.h:
+ echo "#define INET 1" > ${.TARGET}
+ .endif
Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff 2011-11-09 19:51:13 UTC (rev 3838)
@@ -25,8 +25,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -71,7 +73,7 @@
- options INCLUDE_CONFIG_FILE # Include this file in kernel
+@@ -73,7 +75,7 @@
+ options KDB_TRACE # Print a stack trace for a panic
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -80,9 +82,6 @@
+@@ -82,9 +84,6 @@
device acpi
device pci
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -109,7 +108,6 @@
+@@ -111,7 +110,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -52,7 +52,7 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -174,10 +172,6 @@
+@@ -176,10 +174,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -63,7 +63,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -188,8 +182,6 @@
+@@ -190,8 +184,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
@@ -72,7 +72,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -199,12 +191,10 @@
+@@ -201,12 +193,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -85,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
-@@ -214,7 +204,6 @@
+@@ -216,7 +206,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -93,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
-@@ -234,7 +223,6 @@
+@@ -236,7 +225,6 @@
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -101,7 +101,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -254,12 +242,7 @@
+@@ -256,12 +244,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -114,7 +114,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device wpi # Intel 3945ABG wireless NICs.
-@@ -268,11 +251,8 @@
+@@ -270,11 +253,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -126,7 +126,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -287,39 +267,9 @@
+@@ -289,39 +269,9 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
@@ -166,7 +166,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -329,10 +279,10 @@
+@@ -332,10 +282,10 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -224,8 +224,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -71,7 +75,7 @@
- options INCLUDE_CONFIG_FILE # Include this file in kernel
+@@ -73,7 +77,7 @@
+ options KDB_TRACE # Print a stack trace for a panic
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -233,7 +233,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -82,9 +86,6 @@
+@@ -84,9 +88,6 @@
device eisa
device pci
@@ -243,7 +243,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -111,7 +112,6 @@
+@@ -113,7 +114,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -251,7 +251,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
-@@ -184,10 +184,6 @@
+@@ -186,10 +186,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -262,7 +262,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -198,8 +194,6 @@
+@@ -200,8 +196,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
@@ -271,7 +271,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -209,12 +203,10 @@
+@@ -211,12 +205,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -284,7 +284,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -224,7 +216,6 @@
+@@ -226,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
@@ -292,7 +292,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
-@@ -246,7 +237,6 @@
+@@ -248,7 +239,6 @@
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -300,7 +300,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -266,12 +256,7 @@
+@@ -268,12 +258,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -313,7 +313,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
device wpi # Intel 3945ABG wireless NICs.
-@@ -281,11 +266,8 @@
+@@ -283,11 +268,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -325,7 +325,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -300,39 +282,9 @@
+@@ -302,39 +284,9 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
@@ -365,7 +365,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -342,10 +294,10 @@
+@@ -345,10 +297,10 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-9/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_firmware.diff 2011-11-09 19:12:00 UTC (rev 3837)
+++ trunk/kfreebsd-9/debian/patches/999_firmware.diff 2011-11-09 19:51:13 UTC (rev 3838)
@@ -98,15 +98,15 @@
dev/drm/savage_bci.c optional savagedrm
dev/drm/savage_drv.c optional savagedrm
dev/drm/savage_state.c optional savagedrm
-@@ -1091,7 +1031,6 @@
+@@ -1092,7 +1032,6 @@
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
dev/flash/mx25l.c optional mx25l
-dev/fxp/if_fxp.c optional fxp
+ dev/fxp/inphy.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
-@@ -1148,49 +1087,6 @@
+@@ -1150,49 +1089,6 @@
dev/ips/ips_disk.c optional ips
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
@@ -156,7 +156,7 @@
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
-@@ -1203,163 +1099,6 @@
+@@ -1205,163 +1101,6 @@
dev/isp/isp_pci.c optional isp pci
dev/isp/isp_sbus.c optional isp sbus
dev/isp/isp_target.c optional isp
@@ -320,7 +320,7 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-@@ -1474,33 +1213,6 @@
+@@ -1471,33 +1210,6 @@
dev/mvs/mvs.c optional mvs
dev/mvs/mvs_if.m optional mvs
dev/mvs/mvs_pci.c optional mvs pci
@@ -354,7 +354,7 @@
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
-@@ -1590,65 +1302,6 @@
+@@ -1587,65 +1299,6 @@
dev/puc/puc_pci.c optional puc pci
dev/puc/pucdata.c optional puc pci
dev/quicc/quicc_core.c optional quicc
@@ -420,7 +420,7 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1673,14 +1326,7 @@
+@@ -1670,14 +1323,7 @@
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
@@ -435,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
-@@ -1691,9 +1337,6 @@
+@@ -1688,9 +1334,6 @@
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -445,7 +445,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1709,10 +1352,6 @@
+@@ -1706,10 +1349,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
@@ -456,7 +456,7 @@
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
dependency "emu10k1-alsa%diked.h" \
warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1735,8 +1374,6 @@
+@@ -1732,8 +1371,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
@@ -465,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
-@@ -1816,7 +1453,6 @@
+@@ -1813,7 +1450,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
@@ -473,7 +473,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1839,7 +1475,6 @@
+@@ -1836,7 +1472,6 @@
dev/tws/tws_services.c optional tws
dev/tws/tws_user.c optional tws
dev/tx/if_tx.c optional tx
@@ -481,7 +481,7 @@
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
-@@ -1919,18 +1554,16 @@
+@@ -1916,19 +1551,17 @@
dev/usb/net/if_cdce.c optional cdce
dev/usb/net/if_cue.c optional cue
dev/usb/net/if_ipheth.c optional ipheth
@@ -490,6 +490,7 @@
dev/usb/net/if_rue.c optional rue
dev/usb/net/if_udav.c optional udav
dev/usb/net/if_usie.c optional usie
+ dev/usb/net/ruephy.c optional rue
-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
@@ -501,7 +502,7 @@
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}" \
-@@ -1946,11 +1579,9 @@
+@@ -1944,11 +1577,9 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu" \
no-obj no-implicit-rule \
clean "runfw"
@@ -578,7 +579,7 @@
cxgbe \
${_cyclic} \
dc \
-@@ -93,13 +88,11 @@
+@@ -94,13 +89,11 @@
${_ex} \
${_exca} \
${_ext2fs} \
@@ -592,7 +593,7 @@
gem \
geom \
${_glxiic} \
-@@ -140,14 +133,10 @@
+@@ -141,14 +134,10 @@
ip_mroute_mod \
${_ips} \
${_ipw} \
@@ -607,7 +608,7 @@
${_ixgb} \
${_ixgbe} \
jme \
-@@ -202,7 +191,6 @@
+@@ -203,7 +192,6 @@
${_mthca} \
mvs \
mwl \
@@ -615,9 +616,9 @@
mxge \
my \
${_ncp} \
-@@ -250,14 +238,12 @@
- pty \
+@@ -252,14 +240,12 @@
puc \
+ ${_qlxgb} \
ral \
- ralfw \
${_random} \
@@ -630,7 +631,7 @@
${_s3} \
${_safe} \
${_sbni} \
-@@ -267,7 +253,6 @@
+@@ -269,7 +255,6 @@
sdhci \
sem \
send \
@@ -638,7 +639,7 @@
sge \
siba_bwn \
siftr \
-@@ -275,7 +260,6 @@
+@@ -277,7 +262,6 @@
sis \
sk \
${_smbfs} \
@@ -646,7 +647,7 @@
${_snc} \
snp \
${_sound} \
-@@ -290,7 +274,6 @@
+@@ -292,7 +276,6 @@
${_sym} \
${_syscons} \
sysvipc \
@@ -654,7 +655,7 @@
tl \
tmpfs \
${_tpm} \
-@@ -299,7 +282,6 @@
+@@ -301,7 +284,6 @@
twe \
tws \
tx \
@@ -662,7 +663,7 @@
uart \
ubsec \
udf \
-@@ -327,7 +309,6 @@
+@@ -329,7 +311,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -670,7 +671,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -399,9 +380,7 @@
+@@ -405,9 +386,7 @@
_bxe= bxe
_cardbus= cardbus
_cbb= cbb
@@ -680,7 +681,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -500,11 +479,8 @@
+@@ -506,11 +485,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -692,7 +693,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -513,7 +489,6 @@
+@@ -519,7 +495,6 @@
_nxge= nxge
_tpm= tpm
_wpi= wpi
@@ -700,7 +701,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -574,11 +549,8 @@
+@@ -580,11 +555,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -712,7 +713,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -619,7 +591,6 @@
+@@ -626,7 +598,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
More information about the Glibc-bsd-commits
mailing list