[Glibc-bsd-commits] r3612 - in trunk/kfreebsd-9/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Jul 17 16:55:55 UTC 2011
Author: rmh
Date: 2011-07-17 16:55:55 +0000 (Sun, 17 Jul 2011)
New Revision: 3612
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.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-07-17 15:50:31 UTC (rev 3611)
+++ trunk/kfreebsd-9/debian/changelog 2011-07-17 16:55:55 UTC (rev 3612)
@@ -1,17 +1,19 @@
-kfreebsd-9 (9.0~svn224106-1) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn224126-1) experimental; urgency=low
* New upstream snapshot.
- - Refresh all patches.
+ - r224072: Fix initialization of i8259 controller on Malta.
+ (Closes: #633618).
+ - r224126: Restore binary compatibility for GIO_KEYMAP and PIO_KEYMAP.
+ (Closes: #630784).
[ Robert Millan ]
* Revert part of 005_linux_cflags.diff which isn't going to be
accepted by upstream, and caused build breakage on GNU/Linux. Bring
back needed parts of the sed kludge.
- * Fix initialization of i8259 controller on Malta. (Closes: #633618).
* Provide "kfreebsd-headers" virtual package in kfreebsd-headers-
@version at -@abiname at -@flavor at .
- -- Robert Millan <rmh at debian.org> Fri, 15 Jul 2011 17:45:10 +0200
+ -- Robert Millan <rmh at debian.org> Sun, 17 Jul 2011 17:03:23 +0200
kfreebsd-9 (9.0~svn223966-1) experimental; urgency=low
Modified: trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff 2011-07-17 15:50:31 UTC (rev 3611)
+++ trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff 2011-07-17 16:55:55 UTC (rev 3612)
@@ -1,6 +1,6 @@
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
-@@ -55,6 +55,9 @@
+@@ -56,6 +56,9 @@
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff 2011-07-17 15:50:31 UTC (rev 3611)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff 2011-07-17 16:55:55 UTC (rev 3612)
@@ -25,7 +25,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -83,7 +85,7 @@
+@@ -82,7 +84,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
-@@ -92,9 +94,6 @@
+@@ -91,9 +93,6 @@
device acpi
device pci
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -121,7 +120,6 @@
+@@ -120,7 +119,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 @@
+@@ -184,10 +182,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -63,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 +196,6 @@
+@@ -201,8 +195,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.
-@@ -213,12 +205,10 @@
+@@ -212,12 +204,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
-@@ -228,7 +218,6 @@
+@@ -227,7 +217,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
-@@ -248,7 +237,6 @@
+@@ -247,7 +236,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
-@@ -268,12 +256,7 @@
+@@ -267,12 +255,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.
-@@ -282,11 +265,8 @@
+@@ -281,11 +264,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.
-@@ -301,39 +281,9 @@
+@@ -300,39 +280,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
-@@ -343,10 +293,10 @@
+@@ -342,10 +292,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
-@@ -83,7 +87,7 @@
+@@ -82,7 +86,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
-@@ -94,9 +98,6 @@
+@@ -93,9 +97,6 @@
device eisa
device pci
@@ -243,7 +243,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -123,7 +124,6 @@
+@@ -122,7 +123,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 @@
+@@ -194,10 +194,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -262,7 +262,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 +208,6 @@
+@@ -211,8 +207,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.
-@@ -223,12 +217,10 @@
+@@ -222,12 +216,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
-@@ -238,7 +230,6 @@
+@@ -237,7 +229,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
-@@ -260,7 +251,6 @@
+@@ -259,7 +250,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
-@@ -280,12 +270,7 @@
+@@ -279,12 +269,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.
-@@ -295,11 +280,8 @@
+@@ -294,11 +279,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.
-@@ -314,39 +296,9 @@
+@@ -313,39 +295,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
-@@ -356,10 +308,10 @@
+@@ -355,10 +307,10 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
More information about the Glibc-bsd-commits
mailing list