Date: Sun, 18 May 2003 11:31:30 +0300
From: Ruslan Ermilov <ru@FreeBSD.org>
To: current@FreeBSD.org
Cc: re@FreeBSD.org
Subject: Tidying src/release/*/{dokern.sh,drivers.conf}
Message-ID: <20030518083130.GD24393@sunbay.com>
next in thread | raw e-mail | index | archive | help
--2xzXx3ruJf7hsAzo Content-Type: multipart/mixed; boundary="UTZ8bGhNySVQ9LYl" Content-Disposition: inline --UTZ8bGhNySVQ9LYl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Perhaps somebody will find this script useful too. It finds missing GENERIC entries and cross-checks dokern.sh and drivers.conf for redundant entries. It edits out the "SMALL" part of pc98/dokern.sh so as to not give false matches. It should be run with cwd=3D/usr/src/release. The patch that it "generates" is also attached. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --UTZ8bGhNySVQ9LYl Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="chk_dokern.sh_drivers.conf" #!/bin/sh echo Checking */drivers.conf ... for f in */drivers.conf; do arch=`dirname $f` grep -v '^#' $f | grep -v '^$' | awk '{ print $1 }' | while read x; do egrep -qw "^(device|options)[[:space:]]+$x" ../sys/${arch}/conf/GENERIC || \ echo $x not found in $arch/GENERIC sed -e'/"SMALL"/,/^else$/d' ${arch}/dokern.sh | \ grep -qw $x && \ echo "duplicate $x found in ${arch}/dokern.sh" done done echo Checking */dokern.sh ... for f in */dokern.sh; do arch=`dirname $f` sed -e'/"SMALL"/,/^else$/d' $f | \ grep -w -- -e | sed -e's,^[^/]*/,,' -e's,/.*$,,' | grep -v '^ident\.\*GENERIC$' | while read x; do egrep -q "^(device|options|makeoptions)[[:space:]]+$x" \ ../sys/${arch}/conf/GENERIC || \ echo $x not found in $arch/GENERIC grep -qw ^$x ${arch}/drivers.conf && \ echo "duplicate $x found in ${arch}/drivers.conf" done done --UTZ8bGhNySVQ9LYl Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: release/alpha/dokern.sh =================================================================== RCS file: /home/ncvs/src/release/alpha/dokern.sh,v retrieving revision 1.72 diff -u -r1.72 dokern.sh --- release/alpha/dokern.sh 18 May 2003 03:52:22 -0000 1.72 +++ release/alpha/dokern.sh 18 May 2003 08:26:42 -0000 @@ -23,7 +23,6 @@ -e '/DDB/d' \ -e '/INVARIANTS/d' \ -e '/INVARIANT_SUPPORT/d' \ - -e '/WITNESS/d' \ -e '/SMP/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ @@ -52,7 +51,6 @@ -e '/ umass /d' \ -e '/ ums /d' \ -e '/ aue /d' \ - -e '/ axe /d' \ -e '/ cue /d' \ -e '/ kue /d' \ -e '/ firewire /d' \ Index: release/pc98/dokern.sh =================================================================== RCS file: /home/ncvs/src/release/pc98/dokern.sh,v retrieving revision 1.76 diff -u -r1.76 dokern.sh --- release/pc98/dokern.sh 18 May 2003 03:52:22 -0000 1.76 +++ release/pc98/dokern.sh 18 May 2003 08:27:24 -0000 @@ -33,8 +33,6 @@ -e '/ pass /d' \ -e '/ ses /d' \ -e '/ splash /d' \ - -e '/ apm$/d' \ - -e '/ pmtimer$/d' \ -e '/ ppc$/d' \ -e '/ ppbus /d' \ -e '/ lpt /d' \ @@ -98,8 +96,6 @@ -e '/ pass /d' \ -e '/ ses /d' \ -e '/ splash /d' \ - -e '/ apm$/d' \ - -e '/ pmtimer$/d' \ -e '/ ppc$/d' \ -e '/ ppbus /d' \ -e '/ lpt /d' \ Index: sys/alpha/conf/GENERIC =================================================================== RCS file: /home/ncvs/src/sys/alpha/conf/GENERIC,v retrieving revision 1.159 diff -u -r1.159 GENERIC --- sys/alpha/conf/GENERIC 21 Apr 2003 16:44:04 -0000 1.159 +++ sys/alpha/conf/GENERIC 18 May 2003 08:26:10 -0000 @@ -95,6 +95,7 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices device isp # Qlogic family +device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') Index: sys/i386/conf/GENERIC =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v retrieving revision 1.383 diff -u -r1.383 GENERIC --- sys/i386/conf/GENERIC 11 May 2003 06:39:05 -0000 1.383 +++ sys/i386/conf/GENERIC 18 May 2003 08:26:00 -0000 @@ -192,7 +192,9 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x and SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) +device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II --UTZ8bGhNySVQ9LYl-- --2xzXx3ruJf7hsAzo Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+x0TiUkv4P6juNwoRAj04AJ0QodIhkU0Qi1iCIO2Maivb/IlkEgCgi+vy gLoc6wC9sJrieTrG0PqYprg= =yHwr -----END PGP SIGNATURE----- --2xzXx3ruJf7hsAzo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030518083130.GD24393>