[Glibc-bsd-commits] r3785 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Fri Oct 28 12:27:06 UTC 2011
Author: rmh
Date: 2011-10-28 12:27:06 +0000 (Fri, 28 Oct 2011)
New Revision: 3785
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff
trunk/kfreebsd-10/debian/patches/902_version.diff
trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
New upstream snapshot
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-10-27 23:48:39 UTC (rev 3784)
+++ trunk/kfreebsd-10/debian/changelog 2011-10-28 12:27:06 UTC (rev 3785)
@@ -1,5 +1,7 @@
-kfreebsd-10 (10.0~svn226224-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn226872-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+
[ Robert Millan ]
* Remove /boot symlink kludge. See:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633561#88
@@ -14,7 +16,7 @@
* Add 918_unix_socket_overflow.diff, to fix up breakage in our userland
after 000_unix_socket_overflow.diff. Closes: #645527.
- -- Robert Millan <rmh at debian.org> Thu, 27 Oct 2011 21:47:21 +0200
+ -- Robert Millan <rmh at debian.org> Fri, 28 Oct 2011 12:40:27 +0200
kfreebsd-10 (10.0~svn226224-1) experimental; urgency=low
Modified: trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff 2011-10-27 23:48:39 UTC (rev 3784)
+++ trunk/kfreebsd-10/debian/patches/110_disable_trampoline_flavour.diff 2011-10-28 12:27:06 UTC (rev 3785)
@@ -1,6 +1,6 @@
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -61,7 +61,7 @@
+@@ -63,7 +63,7 @@
# XXX hardcoded kernel entry point
ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff 2011-10-27 23:48:39 UTC (rev 3784)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff 2011-10-28 12:27:06 UTC (rev 3785)
@@ -1,6 +1,6 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -128,7 +128,7 @@
+@@ -132,7 +132,7 @@
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
Modified: trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-10-27 23:48:39 UTC (rev 3784)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2011-10-28 12:27:06 UTC (rev 3785)
@@ -53,7 +53,7 @@
dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -141,8 +141,6 @@
+@@ -144,8 +144,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
@@ -117,7 +117,7 @@
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -135,8 +135,6 @@
+@@ -138,8 +138,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-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2011-10-27 23:48:39 UTC (rev 3784)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2011-10-28 12:27:06 UTC (rev 3785)
@@ -25,7 +25,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -82,7 +84,7 @@
+@@ -85,7 +87,7 @@
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
# Make an SMP-capable kernel by default
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -91,9 +93,6 @@
+@@ -94,9 +96,6 @@
device acpi
device pci
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -120,7 +119,6 @@
+@@ -123,7 +122,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
-@@ -185,10 +183,6 @@
+@@ -188,10 +186,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
-@@ -199,8 +193,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
@@ -72,7 +72,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -210,12 +202,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
@@ -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
-@@ -225,7 +215,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
@@ -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
-@@ -245,7 +234,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
@@ -101,7 +101,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -265,12 +253,7 @@
+@@ -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.
@@ -114,7 +114,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device wpi # Intel 3945ABG wireless NICs.
-@@ -279,11 +262,8 @@
+@@ -282,11 +265,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.
-@@ -298,39 +278,9 @@
+@@ -301,39 +281,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
-@@ -340,10 +290,10 @@
+@@ -344,10 +294,10 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -224,7 +224,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -82,7 +86,7 @@
+@@ -85,7 +89,7 @@
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
# To make an SMP kernel, the next two lines are needed
@@ -233,7 +233,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -93,9 +97,6 @@
+@@ -96,9 +100,6 @@
device eisa
device pci
@@ -243,7 +243,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -122,7 +123,6 @@
+@@ -125,7 +126,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
-@@ -195,10 +195,6 @@
+@@ -198,10 +198,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
-@@ -209,8 +205,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
@@ -271,7 +271,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -220,12 +214,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
@@ -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
-@@ -235,7 +227,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
@@ -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
-@@ -257,7 +248,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.
@@ -300,7 +300,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -277,12 +267,7 @@
+@@ -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.
@@ -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.
-@@ -292,11 +277,8 @@
+@@ -295,11 +280,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.
-@@ -311,39 +293,9 @@
+@@ -314,39 +296,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
-@@ -353,10 +305,10 @@
+@@ -357,10 +309,10 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
More information about the Glibc-bsd-commits
mailing list