[Glibc-bsd-commits] r1323 - in trunk/kfreebsd-common: . debian
Robert Millan
rmh at costa.debian.org
Wed Mar 15 11:01:01 UTC 2006
Author: rmh
Date: 2006-03-15 11:00:59 +0000 (Wed, 15 Mar 2006)
New Revision: 1323
Added:
trunk/kfreebsd-common/module_descriptions
Removed:
trunk/kfreebsd-common/debian/module_descriptions
Modified:
trunk/kfreebsd-common/debian/changelog
trunk/kfreebsd-common/debian/config
trunk/kfreebsd-common/debian/copyright
trunk/kfreebsd-common/debian/postinst
trunk/kfreebsd-common/debian/templates
Log:
* Fix a pair of broken regexps.
* Remove /etc/init.d/networking hack. It brought more problems than
it actualy solved.
* Exclude acpi|linux|linprocfs modules from automatic list.
* copyright: Remove old FSF address.
- Move debian/module_descriptions to module_descriptions.
Modified: trunk/kfreebsd-common/debian/changelog
===================================================================
--- trunk/kfreebsd-common/debian/changelog 2006-03-15 09:48:23 UTC (rev 1322)
+++ trunk/kfreebsd-common/debian/changelog 2006-03-15 11:00:59 UTC (rev 1323)
@@ -1,11 +1,16 @@
-kfreebsd-common (0.1.2) UNRELEASED; urgency=low
+kfreebsd-common (0.2.0) unstable; 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).
* Use "high" priority for network drivers.
+ * Fix a pair of broken regexps.
+ * Remove /etc/init.d/networking hack. It brought more problems than
+ it actualy solved.
+ * Exclude acpi|linux|linprocfs modules from automatic list.
+ * copyright: Remove old FSF address.
- -- Robert Millan <rmh at aybabtu.com> Wed, 15 Mar 2006 10:27:51 +0100
+ -- Robert Millan <rmh at aybabtu.com> Wed, 15 Mar 2006 11:59:36 +0100
kfreebsd-common (0.1.1) unreleased; urgency=low
Modified: trunk/kfreebsd-common/debian/config
===================================================================
--- trunk/kfreebsd-common/debian/config 2006-03-15 09:48:23 UTC (rev 1322)
+++ trunk/kfreebsd-common/debian/config 2006-03-15 11:00:59 UTC (rev 1323)
@@ -12,14 +12,16 @@
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"
+ if line=`grep "^$1[[:space:]]" /usr/share/kfreebsd-common/module_descriptions` ; then
+ echo ${line} | sed -e "s/^[^[:space:]]*[[:space:]]*/ (/g" -e "s/$/)/g"
fi
return 0
}
-for i in `ls ${module_dir}/*.ko` ; do
+for i in `ls ${module_dir}/*.ko | sed -e "s,.*/,,g" -e "s/\.ko$//g"` ; do
case $i in
+ # acpi is handler by boot loader, linux/linprocfs are always loaded
+ acpi|linux|linprocfs) ;;
if_*)
if [ "${network}" = "" ] ; then
network="$i`get_module_description $i`"
Modified: trunk/kfreebsd-common/debian/copyright
===================================================================
--- trunk/kfreebsd-common/debian/copyright 2006-03-15 09:48:23 UTC (rev 1322)
+++ trunk/kfreebsd-common/debian/copyright 2006-03-15 11:00:59 UTC (rev 1323)
@@ -15,10 +15,6 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
On Debian GNU systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
Deleted: trunk/kfreebsd-common/debian/module_descriptions
===================================================================
--- trunk/kfreebsd-common/debian/module_descriptions 2006-03-15 09:48:23 UTC (rev 1322)
+++ trunk/kfreebsd-common/debian/module_descriptions 2006-03-15 11:00:59 UTC (rev 1323)
@@ -1,74 +0,0 @@
-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/postinst
===================================================================
--- trunk/kfreebsd-common/debian/postinst 2006-03-15 09:48:23 UTC (rev 1322)
+++ trunk/kfreebsd-common/debian/postinst 2006-03-15 11:00:59 UTC (rev 1323)
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for kfreebsd-config
+# postinst script for kfreebsd-common
#
# see: dh_installdeb(1)
@@ -36,28 +36,12 @@
EOF
for i in network sound other ; do
db_get kfreebsd-config/$i
- for j in `echo "$RET" | sed -e "s/([^)]*)//g" -e "s/, //g"` ; do
+ for j in `echo "$RET" | sed -e "s/, /|/g" | tr "|" "\n" | sed -e "s/ .*//g"` ; do
echo "$j" >> /etc/modules.d/kfreebsd-config
done
done
new="`get_modules`"
- network=false
- case ":${old}:${new}" in
- *:if_*)
- if test -x /etc/init.d/networking ; then
- network=true
- fi
- ;;
- esac
-
- # Don't let network bother us when we mess with the interfaces
- if ${network} ; then
- /etc/init.d/networking stop
- # Even if something fails, we don't want to kill the network
- set +e
- fi
-
# Unload modules that:
# a) were listed to be loaded in the old list
# b) are not listed to be loaded in the new list
@@ -86,11 +70,6 @@
# need to worry about consistency this time)
/etc/init.d/kldutils start
- # Bring it back
- if ${network} ; then
- /etc/init.d/networking start
- set -e
- fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/kfreebsd-common/debian/templates
===================================================================
--- trunk/kfreebsd-common/debian/templates 2006-03-15 09:48:23 UTC (rev 1322)
+++ trunk/kfreebsd-common/debian/templates 2006-03-15 11:00:59 UTC (rev 1323)
@@ -25,4 +25,7 @@
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.
+ cathegories. Select those you find adequate.
+ .
+ Note: If you don't know, don't select any yet. You can always come back to
+ this question with "dpkg-reconfigure kfreebsd-config".
Copied: trunk/kfreebsd-common/module_descriptions (from rev 1322, trunk/kfreebsd-common/debian/module_descriptions)
More information about the Glibc-bsd-commits
mailing list