[Glibc-bsd-commits] r1319 - trunk/kfreebsd-common/debian

Robert Millan rmh at costa.debian.org
Wed Mar 15 08:55:53 UTC 2006 

Author: rmh
Date: 2006-03-15 08:55:52 +0000 (Wed, 15 Mar 2006)
New Revision: 1319

Added:
   trunk/kfreebsd-common/debian/module_descriptions
Removed:
   trunk/kfreebsd-common/debian/get_module_list
Modified:
   trunk/kfreebsd-common/debian/changelog
   trunk/kfreebsd-common/debian/config
   trunk/kfreebsd-common/debian/dirs
   trunk/kfreebsd-common/debian/install
   trunk/kfreebsd-common/debian/templates
Log:
  * Overhaul module name lists to make them dynamic.  A module_descriptions
    list is maintained with known descriptions (when there's no match, no
    description is provided).

Modified: trunk/kfreebsd-common/debian/changelog
===================================================================
--- trunk/kfreebsd-common/debian/changelog	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/changelog	2006-03-15 08:55:52 UTC (rev 1319)
@@ -1,3 +1,11 @@
+kfreebsd-common (0.1.2) UNRELEASED; urgency=low
+
+  * Overhaul module name lists to make them dynamic.  A module_descriptions
+    list is maintained with known descriptions (when there's no match, no
+    description is provided).
+
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 15 Mar 2006 09:55:26 +0100
+
 kfreebsd-common (0.1.1) unreleased; urgency=low
 
   * init.d: Fix /dev/da[0-9]* too.

Modified: trunk/kfreebsd-common/debian/config
===================================================================
--- trunk/kfreebsd-common/debian/config	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/config	2006-03-15 08:55:52 UTC (rev 1319)
@@ -4,11 +4,54 @@
 
 . /usr/share/debconf/confmodule
 
+if test -e /lib/modules/`uname -r` ; then
+  module_dir="/lib/modules/`uname -r`"
+else
+  module_dir="/boot/kernel"
+fi
+
+get_module_description ()
+{
+  if line=`grep "^$1\t" /usr/share/kfreebsd-common/module_descriptions` ; then
+    echo ${line} | sed -e "s/^.*\t/ (/g" -e "s/$/)/g"
+  fi
+  return 0
+}
+
+for i in `ls ${module_dir}/*.ko` ; do
+  case $i in
+    if_*)
+      if [ "${network}" = "" ] ; then
+        network="$i`get_module_description $i`"
+      else
+        network="${network}, $i`get_module_description $i`"
+      fi
+    ;;
+    snd_*)
+      if [ "${sound}" = "" ] ; then
+        sound="$i`get_module_description $i`"
+      else
+        sound="${sound}, $i`get_module_description $i`"
+      fi
+    ;;
+    *)
+      if [ "${other}" = "" ] ; then
+        other="$i`get_module_description $i`"
+      else
+        other="${other}, $i`get_module_description $i`"
+      fi
+    ;;
+  esac
+done
+
+db_subst kfreebsd-config/network choices "$network"
 db_input medium kfreebsd-config/network || true
 db_go
 
+db_subst kfreebsd-config/sound choices "$sound"
 db_input high kfreebsd-config/sound || true
 db_go
 
+db_subst kfreebsd-config/other choices "$other"
 db_input high kfreebsd-config/other || true
 db_go

Modified: trunk/kfreebsd-common/debian/dirs
===================================================================
--- trunk/kfreebsd-common/debian/dirs	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/dirs	2006-03-15 08:55:52 UTC (rev 1319)
@@ -1 +1,2 @@
 usr/sbin
+usr/share/kfreebsd-common

Deleted: trunk/kfreebsd-common/debian/get_module_list
===================================================================
--- trunk/kfreebsd-common/debian/get_module_list	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/get_module_list	2006-03-15 08:55:52 UTC (rev 1319)
@@ -1,6 +0,0 @@
-#!/bin/sh
-(for i in `cd /boot/kernel/ && ls *.ko | sed -e "s/\.ko$//g"` ; do
-  echo -n "$i: "
-  grep "^${i}_load=\"NO\".*#" /boot/defaults/loader.conf | sed -e "s/[^#]*# //g"
-  echo
-done) | grep -v "^$"

Modified: trunk/kfreebsd-common/debian/install
===================================================================
--- trunk/kfreebsd-common/debian/install	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/install	2006-03-15 08:55:52 UTC (rev 1319)
@@ -1 +1,2 @@
-snd_probe usr/sbin
+snd_probe			usr/sbin
+module_descriptions		usr/share/kfreebsd-common

Added: trunk/kfreebsd-common/debian/module_descriptions
===================================================================
--- trunk/kfreebsd-common/debian/module_descriptions	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/module_descriptions	2006-03-15 08:55:52 UTC (rev 1319)
@@ -0,0 +1,74 @@
+if_an			Aironet 4500/4800 802.11 wireless NICs
+if_ar			Digi SYNC/570i
+if_aue			ADMtek USB ethernet
+if_awi			AMD PCnetMobile IEEE 802.11 wireless NICs
+if_axe			ASIX Electronics AX88172 USB ethernet
+if_bfe			Broadcom BCM440x 10/100 Ethernet
+if_bge			Broadcom BCM570x PCI gigabit ethernet
+if_cm			SMC (90c26/90c56/90c66)
+if_cue			CATC USB ethernet
+if_dc			DEC/Intel 21143 and various workalikes
+if_de			DEC DC21x4x ethernet
+if_disc			Discard device
+if_ed			National Semiconductor DS8390/WD83C690 ethernet
+if_ef			pseudo-device providing support for multiple ethernet frame types
+if_el			3Com Etherlink 3C501
+if_em			Intel(R) PRO/1000 gigabit ethernet
+if_en			Midway-based ATM interfaces
+if_ep			3Com Etherlink III (3c5x9)
+if_ex			Intel EtherExpress Pro/10 ethernet
+if_faith		IPv6-to-IPv4 TCP relay capturing interface
+if_fe			Fujitsu MB86960A/MB86965A based Ethernet adapters
+if_fwe			Ethernet over FireWire (non-standard!)
+if_fxp			Intel EtherExpress PRO/100B (82557/82558)
+if_gif			generic tunnel interface
+if_gre			encapsulating network device
+if_gx			Intel Pro/1000 gigabit ethernet
+if_ie			Intel 82586
+if_kue			Kawasaki LSI USB ethernet
+if_lge			Level 1 LXT1001 NetCellerator PCI gigabit ethernet
+if_lnc			AMD Lance/PCnet Ethernet
+if_my			Myson PCI fast ethernet
+if_nge			National Semiconductor PCI gigabit ethernet
+if_pcn			AMD PCnet PCI
+if_ppp			Kernel ppp
+if_ray			Raytheon Raylink/Webgear Aviator PCCard
+if_re			RealTek 8139C+/8169/8169S/8110S
+if_rl			RealTek 8129/8139
+if_rue			RealTek RTL8150 USB Ethernet
+if_sbni			Granch SBNI12 leased line adapters
+if_sf			Adaptec Duralink PCI (AIC-6915 "starfire")
+if_sis			Silicon Integrated Systems SiS 900/7016
+if_sk			SysKonnect SK-984x series PCI gigabit ethernet
+if_sl			SLIP
+if_sn			SMC 91Cxx
+if_sr			synchronous RISCom/N2 / WANic 400/405
+if_ste			Sundance Technologies ST201 fast ethernet
+if_stf			6to4 tunnel interface
+if_tap			Ethernet tunnel software network interface
+if_ti			Alteon Networks Tigon 1 and Tigon 2
+if_tl			Texas Instruments TNETE100 ("ThunderLAN")
+if_tun			Tunnel driver (user process ppp)
+if_tx			SMC 83c17x fast ethernet
+if_txp			3Com 3XP Typhoon/Sidewinder (3CR990)
+if_vge			VIA VT612x gigabit ethernet
+if_vlan			IEEE 802.1Q VLAN network interface
+if_vr			VIA Rhine I and Rhine II
+if_vx			3Com 3C590 family
+if_wb			Winbond W89C840F
+if_wi			WaveLAN/IEEE 802.11 wireless NICs
+if_xe			Xircom CreditCard PCMCIA
+if_xl			3Com Etherlink XL (3c900/3c905/3c905B)
+lpt			Printer
+plip			TCP/IP over parallel
+snd_driver		All sound drivers
+snd_emu10k1		Creative Sound Blaster Live
+snd_ich			Intel ICH / Silicon Integrated Systems SiS
+snd_sbc			Creative Sound Blaster ISA and compatible
+sound			Digital sound subsystem
+speaker			AT speaker module
+ulpt			USB Printer
+umodem			Modems
+urio			Diamond Rio 500 audio player
+uscanner		USB Scanners
+wlan			802.11 support

Modified: trunk/kfreebsd-common/debian/templates
===================================================================
--- trunk/kfreebsd-common/debian/templates	2006-03-14 21:38:32 UTC (rev 1318)
+++ trunk/kfreebsd-common/debian/templates	2006-03-15 08:55:52 UTC (rev 1319)
@@ -1,6 +1,6 @@
 Template: kfreebsd-config/network
 Type: multiselect
-Choices: if_an (Aironet 4500/4800 802.11 wireless NICs), if_ar (Digi SYNC/570i), if_arl, if_aue (ADMtek USB ethernet), if_awi (AMD PCnetMobile IEEE 802.11 wireless NICs), if_axe (ASIX Electronics AX88172 USB ethernet), if_bfe (Broadcom BCM440x 10/100 Ethernet), if_bge (Broadcom BCM570x PCI gigabit ethernet), if_cm (SMC (90c26/90c56/90c66)), if_cp, if_ct, if_cue (CATC USB ethernet), if_cx, if_dc (DEC/Intel 21143 and various workalikes), if_de (DEC DC21x4x ethernet), if_disc (Discard device), if_ed (National Semiconductor DS8390/WD83C690 ethernet), if_ef (pseudo-device providing support for multiple ethernet frame types), if_el (3Com Etherlink 3C501), if_em (Intel(R) PRO/1000 gigabit ethernet), if_en (Midway-based ATM interfaces), if_ep (3Com Etherlink III (3c5x9)), if_ex (Intel EtherExpress Pro/10 ethernet), if_faith (IPv6-to-IPv4 TCP relay capturing interface), if_fatm, if_fe (Fujitsu MB86960A/MB86965A based Ethernet adapters), if_fwe (Ethernet over FireWire (non-standard!)), if_fwip, if_fxp (Intel EtherExpress PRO/100B (82557/82558)), if_gif (generic tunnel interface), if_gre (encapsulating network device), if_gx (Intel Pro/1000 gigabit ethernet), if_harp, if_hatm, if_hme, if_ic, if_ie (Intel 82586), if_kue (Kawasaki LSI USB ethernet), if_lge (Level 1 LXT1001 NetCellerator PCI gigabit ethernet), if_lnc (AMD Lance/PCnet Ethernet), if_my (Myson PCI fast ethernet), if_nge (National Semiconductor PCI gigabit ethernet), if_patm, if_pcn (AMD PCnet PCI), if_ray (Raytheon Raylink/Webgear Aviator PCCard), if_re (RealTek 8139C+/8169/8169S/8110S), if_rl (RealTek 8129/8139), if_rue (RealTek RTL8150 USB Ethernet), if_sbni (Granch SBNI12 leased line adapters), if_sbsh, if_sf (Adaptec Duralink PCI (AIC-6915 "starfire")), if_sis (Silicon Integrated Systems SiS 900/7016), if_sk (SysKonnect SK-984x series PCI gigabit ethernet), if_sn (SMC 91Cxx), if_sr (synchronous RISCom/N2 / WANic 400/405), if_ste (Sundance Technologies ST201 fast ethernet), if_stf (6to4 tunnel interface), if_tap (Ethernet tunnel software network interface), if_ti (Alteon Networks Tigon 1 and Tigon 2), if_tl (Texas Instruments TNETE100 ("ThunderLAN")), if_tx (SMC 83c17x fast ethernet), if_txp (3Com 3XP Typhoon/Sidewinder (3CR990)), if_udav, if_vge (VIA VT612x gigabit ethernet), if_vlan (IEEE 802.1Q VLAN network interface), if_vr (VIA Rhine I and Rhine II), if_vx (3Com 3C590 family), if_wb (Winbond W89C840F), if_wi (WaveLAN/IEEE 802.11 wireless NICs), if_xe (Xircom CreditCard PCMCIA), if_xl (3Com Etherlink XL (3c900/3c905/3c905B)), wlan (802.11 support)
+Choices: ${choices}
 Description: Select your network card drivers
  Select the appropiate driver for your network cards. You may select more than
  one driver, or none at all, depending on the number of cards you have.
@@ -11,7 +11,7 @@
 
 Template: kfreebsd-config/sound
 Type: multiselect
-Choices: snd_ad1816 (ad1816), snd_als4000, snd_cmi (cmi), snd_cs4281 (cs4281), snd_csa (csa), snd_driver (All sound drivers), snd_ds1 (ds1), snd_emu10k1 (Creative Sound Blaster Live), snd_es137x (es137x), snd_ess (ess), snd_fm801 (fm801), snd_ich (Intel ICH / Silicon Integrated Systems SiS), snd_maestro (Maestro), snd_maestro3 (Maestro3), snd_mss (Mss), snd_neomagic (Neomagic), snd_sbc (Creative Sound Blaster ISA and compatible), snd_solo (Solo), snd_t4dwave (t4dwave), snd_uaudio, snd_via8233 (via8233), snd_via82c686 (via82c686), snd_vibes, sound (Digital sound subsystem), speaker (AT speaker module)
+Choices: ${choices}
 Description: Select your sound card drivers
  Select the appropiate driver for your sound cards. You may select more than
  one driver, or none at all, depending on the number of cards you have.
@@ -22,7 +22,7 @@
 
 Template: kfreebsd-config/other
 Type: multiselect
-Choices: if_ppp (Kernel ppp), if_sl (SLIP), if_tun (Tunnel driver (user process ppp)), lpt (Printer), plip (TCP/IP over parallel), ulpt (USB Printer), umodem (Modems), urio (Diamond Rio 500 MP3 player), uscanner (USB Scanners)
+Choices: ${choices}
 Description: Select other modules
  Below is a selection of modules that don't fall in either of the previous
  cathegories, but are still commonly used. Select those you find adequate.

More information about the Glibc-bsd-commits mailing list