[Glibc-bsd-commits] r4242 - in trunk: kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches

Robert Millan rmh at alioth.debian.org
Fri Apr 27 22:43:45 UTC 2012


Author: rmh
Date: 2012-04-27 22:43:45 +0000 (Fri, 27 Apr 2012)
New Revision: 4242

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/999_config.diff
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/999_config.diff
Log:
Add back USB drivers for network and serial ports. Userland (specially D-I) is not yet ready to handle auto-load reliably.

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2012-04-27 22:16:35 UTC (rev 4241)
+++ trunk/kfreebsd-8/debian/changelog	2012-04-27 22:43:45 UTC (rev 4242)
@@ -1,8 +1,10 @@
 kfreebsd-8 (8.3-2) UNRELEASED; urgency=low
 
   * remove_tmpfs_warning.diff: Remove tmpfs warning as done in 8-STABLE.
+  * Add back USB drivers for network and serial ports. Userland
+    (specially D-I) is not yet ready to handle auto-load reliably.
 
- -- Robert Millan <rmh at debian.org>  Sat, 21 Apr 2012 00:18:28 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Apr 2012 00:43:33 +0200
 
 kfreebsd-8 (8.3-1) unstable; urgency=low
 

Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff	2012-04-27 22:16:35 UTC (rev 4241)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff	2012-04-27 22:43:45 UTC (rev 4242)
@@ -135,43 +135,23 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -292,35 +277,9 @@
- device		ohci		# OHCI PCI->USB interface
+@@ -293,12 +278,12 @@
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		usb		# USB Bus (required)
--#device		udbp		# USB Double Bulk Pipe devices
+ #device		udbp		# USB Double Bulk Pipe devices
 -device		uhid		# "Human Interface Devices"
++#device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
 -device		ulpt		# Printer
++#device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
--# USB Serial devices
--device		uark		# Technologies ARK3116 based serial adapters
--device		ubsa		# Belkin F5U103 and compatible serial adapters
--device		uftdi		# For FTDI usb serial adapters
--device		uipaq		# Some WinCE based devices
--device		uplcom		# Prolific PL-2303 serial adapters
--device		uslcom		# SI Labs CP2101/CP2102 serial adapters
--device		uvisor		# Visor and Palm devices
--device		uvscom		# USB serial support for DDI pocket's PHS
--# USB Ethernet, requires miibus
--device		aue		# ADMtek USB Ethernet
--device		axe		# ASIX Electronics USB Ethernet
--device		cdce		# Generic USB over Ethernet
--device		cue		# CATC USB Ethernet
--device		kue		# Kawasaki LSI USB Ethernet
--device		rue		# RealTek RTL8150 USB Ethernet
--device		udav		# Davicom DM9601E USB
--# USB Wireless
--device		rum		# Ralink Technology RT2501USB wireless NICs
--device		uath		# Atheros AR5523 wireless NICs
--device		ural		# Ralink Technology RT2500USB wireless NICs
--device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
- 
- # FireWire support
- device		firewire	# FireWire bus code
-@@ -329,3 +288,11 @@
++#device		urio		# Diamond Rio 500 MP3 player
+ # USB Serial devices
+ device		uark		# Technologies ARK3116 based serial adapters
+ device		ubsa		# Belkin F5U103 and compatible serial adapters
+@@ -329,3 +314,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
@@ -328,44 +308,23 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -305,36 +292,9 @@
- device		ohci		# OHCI PCI->USB interface
+@@ -306,12 +293,12 @@
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		usb		# USB Bus (required)
--#device		udbp		# USB Double Bulk Pipe devices
+ #device		udbp		# USB Double Bulk Pipe devices
 -device		uhid		# "Human Interface Devices"
++#device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
 -device		ulpt		# Printer
++#device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
--# USB Serial devices
--device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
--device		uark		# Technologies ARK3116 based serial adapters
--device		ubsa		# Belkin F5U103 and compatible serial adapters
--device		uftdi		# For FTDI usb serial adapters
--device		uipaq		# Some WinCE based devices
--device		uplcom		# Prolific PL-2303 serial adapters
--device		uslcom		# SI Labs CP2101/CP2102 serial adapters
--device		uvisor		# Visor and Palm devices
--device		uvscom		# USB serial support for DDI pocket's PHS
--# USB Ethernet, requires miibus
--device		aue		# ADMtek USB Ethernet
--device		axe		# ASIX Electronics USB Ethernet
--device		cdce		# Generic USB over Ethernet
--device		cue		# CATC USB Ethernet
--device		kue		# Kawasaki LSI USB Ethernet
--device		rue		# RealTek RTL8150 USB Ethernet
--device		udav		# Davicom DM9601E USB
--# USB Wireless
--device		rum		# Ralink Technology RT2501USB wireless NICs
--device		uath		# Atheros AR5523 wireless NICs
--device		ural		# Ralink Technology RT2500USB wireless NICs
--device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
- 
- # FireWire support
- device		firewire	# FireWire bus code
-@@ -343,3 +303,11 @@
++#device		urio		# Diamond Rio 500 MP3 player
+ # USB Serial devices
+ device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
+ device		uark		# Technologies ARK3116 based serial adapters
+@@ -343,3 +330,11 @@
  device		fwip		# IP over FireWire (RFC 2734,3146)
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2012-04-27 22:16:35 UTC (rev 4241)
+++ trunk/kfreebsd-9/debian/changelog	2012-04-27 22:43:45 UTC (rev 4242)
@@ -4,8 +4,10 @@
     9-STABLE.  (Closes: #666747)
   * remove_tmpfs_warning.diff: Remove tmpfs warning as done in HEAD with
     same codebase.
+  * Add back USB drivers for network and serial ports. Userland
+    (specially D-I) is not yet ready to handle auto-load reliably.
 
- -- Robert Millan <rmh at debian.org>  Fri, 20 Apr 2012 23:49:52 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Apr 2012 00:43:13 +0200
 
 kfreebsd-9 (9.0-2) unstable; urgency=low
 

Modified: trunk/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/999_config.diff	2012-04-27 22:16:35 UTC (rev 4241)
+++ trunk/kfreebsd-9/debian/patches/999_config.diff	2012-04-27 22:43:45 UTC (rev 4242)
@@ -126,47 +126,23 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -289,39 +269,9 @@
- device		ehci		# EHCI PCI->USB interface (USB 2.0)
+@@ -290,12 +270,12 @@
  device		xhci		# XHCI PCI->USB interface (USB 3.0)
  device		usb		# USB Bus (required)
--#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
+ #device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
 -device		uhid		# "Human Interface Devices"
++#device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
 -device		ulpt		# Printer
++#device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
--# USB Serial devices
--device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
--device		uark		# Technologies ARK3116 based serial adapters
--device		ubsa		# Belkin F5U103 and compatible serial adapters
--device		uftdi		# For FTDI usb serial adapters
--device		uipaq		# Some WinCE based devices
--device		uplcom		# Prolific PL-2303 serial adapters
--device		uslcom		# SI Labs CP2101/CP2102 serial adapters
--device		uvisor		# Visor and Palm devices
--device		uvscom		# USB serial support for DDI pocket's PHS
--# USB Ethernet, requires miibus
--device		aue		# ADMtek USB Ethernet
--device		axe		# ASIX Electronics USB Ethernet
--device		cdce		# Generic USB over Ethernet
--device		cue		# CATC USB Ethernet
--device		kue		# Kawasaki LSI USB Ethernet
--device		rue		# RealTek RTL8150 USB Ethernet
--device		udav		# Davicom DM9601E USB
--# USB Wireless
--device		rum		# Ralink Technology RT2501USB wireless NICs
--device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
--device		uath		# Atheros AR5523 wireless NICs
--device		upgt		# Conexant/Intersil PrismGT wireless NICs.
--device		ural		# Ralink Technology RT2500USB wireless NICs
--device		urtw		# Realtek RTL8187B/L wireless NICs
--device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
- 
- # FireWire support
- device		firewire	# FireWire bus code
-@@ -332,10 +282,10 @@
++#device		urio		# Diamond Rio 500 MP3 player
+ # USB Serial devices
+ device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
+ device		uark		# Technologies ARK3116 based serial adapters
+@@ -332,10 +312,10 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  
@@ -325,47 +301,23 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -302,39 +284,9 @@
- device		ehci		# EHCI PCI->USB interface (USB 2.0)
+@@ -303,12 +285,12 @@
  device		xhci		# XHCI PCI->USB interface (USB 3.0)
  device		usb		# USB Bus (required)
--#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
+ #device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
 -device		uhid		# "Human Interface Devices"
++#device		uhid		# "Human Interface Devices"
  device		ukbd		# Keyboard
 -device		ulpt		# Printer
++#device		ulpt		# Printer
  device		umass		# Disks/Mass storage - Requires scbus and da
  device		ums		# Mouse
 -device		urio		# Diamond Rio 500 MP3 player
--# USB Serial devices
--device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
--device		uark		# Technologies ARK3116 based serial adapters
--device		ubsa		# Belkin F5U103 and compatible serial adapters
--device		uftdi		# For FTDI usb serial adapters
--device		uipaq		# Some WinCE based devices
--device		uplcom		# Prolific PL-2303 serial adapters
--device		uslcom		# SI Labs CP2101/CP2102 serial adapters
--device		uvisor		# Visor and Palm devices
--device		uvscom		# USB serial support for DDI pocket's PHS
--# USB Ethernet, requires miibus
--device		aue		# ADMtek USB Ethernet
--device		axe		# ASIX Electronics USB Ethernet
--device		cdce		# Generic USB over Ethernet
--device		cue		# CATC USB Ethernet
--device		kue		# Kawasaki LSI USB Ethernet
--device		rue		# RealTek RTL8150 USB Ethernet
--device		udav		# Davicom DM9601E USB
--# USB Wireless
--device		rum		# Ralink Technology RT2501USB wireless NICs
--device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
--device		uath		# Atheros AR5523 wireless NICs
--device		upgt		# Conexant/Intersil PrismGT wireless NICs.
--device		ural		# Ralink Technology RT2500USB wireless NICs
--device		urtw		# Realtek RTL8187B/L wireless NICs
--device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
- 
- # FireWire support
- device		firewire	# FireWire bus code
-@@ -345,10 +297,10 @@
++#device		urio		# Diamond Rio 500 MP3 player
+ # USB Serial devices
+ device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
+ device		uark		# Technologies ARK3116 based serial adapters
+@@ -345,10 +327,10 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  




More information about the Glibc-bsd-commits mailing list