[Glibc-bsd-commits] r3759 - in trunk/kfreebsd-9/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Oct 22 17:12:27 UTC 2011
Author: rmh
Date: 2011-10-22 17:12:27 +0000 (Sat, 22 Oct 2011)
New Revision: 3759
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff
trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-9/debian/patches/999_config.diff
Log:
New upstream snapshot
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-10-22 16:18:41 UTC (rev 3758)
+++ trunk/kfreebsd-9/debian/changelog 2011-10-22 17:12:27 UTC (rev 3759)
@@ -1,4 +1,4 @@
-kfreebsd-9 (9.0~svn226368-1) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn226626-1) UNRELEASED; urgency=low
* New upstream snapshot.
Modified: trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff 2011-10-22 16:18:41 UTC (rev 3758)
+++ trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff 2011-10-22 17:12:27 UTC (rev 3759)
@@ -1,6 +1,6 @@
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
-@@ -1386,6 +1386,8 @@
+@@ -1399,6 +1399,8 @@
struct thread *td;
{
struct pipe *pipe = fp->f_data;
@@ -9,9 +9,9 @@
#ifdef MAC
int error;
-@@ -1412,6 +1414,8 @@
- * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
- * XXX (st_dev, st_ino) should be unique.
+@@ -1426,6 +1428,8 @@
+ /*
+ * Left as 0: st_nlink, st_rdev, st_flags, st_gen.
*/
+ hash = (unsigned long) (pipe->pipe_pair);
+ ub->st_ino = (((hash >> 31) ^ hash) & 0x7FFFFFFF);
Modified: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-10-22 16:18:41 UTC (rev 3758)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-10-22 17:12:27 UTC (rev 3759)
@@ -53,7 +53,7 @@
dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -141,8 +141,6 @@
+@@ -130,8 +130,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 @@
+@@ -124,8 +124,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-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff 2011-10-22 16:18:41 UTC (rev 3758)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff 2011-10-22 17:12:27 UTC (rev 3759)
@@ -25,8 +25,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -82,7 +84,7 @@
- options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
+@@ -71,7 +73,7 @@
+ options INCLUDE_CONFIG_FILE # Include this file in kernel
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -91,9 +93,6 @@
+@@ -80,9 +82,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 @@
+@@ -109,7 +108,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 @@
+@@ -174,10 +172,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 @@
+@@ -188,8 +182,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 @@
+@@ -199,12 +191,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 @@
+@@ -214,7 +204,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 @@
+@@ -234,7 +223,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 @@
+@@ -254,12 +242,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 @@
+@@ -268,11 +251,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 @@
+@@ -287,39 +267,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 @@
+@@ -329,10 +279,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
-@@ -82,7 +86,7 @@
- options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
+@@ -71,7 +75,7 @@
+ options INCLUDE_CONFIG_FILE # Include this file in kernel
# 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
-@@ -93,9 +97,6 @@
+@@ -82,9 +86,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 @@
+@@ -111,7 +112,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 @@
+@@ -184,10 +184,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 @@
+@@ -198,8 +194,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 @@
+@@ -209,12 +203,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 @@
+@@ -224,7 +216,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 @@
+@@ -246,7 +237,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 @@
+@@ -266,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.
@@ -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 @@
+@@ -281,11 +266,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 @@
+@@ -300,39 +282,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 @@
+@@ -342,10 +294,10 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
More information about the Glibc-bsd-commits
mailing list