Date: Sun, 18 May 2003 21:39:10 +0300
From: Ruslan Ermilov <ru@FreeBSD.org>
To: Scott Long <scott_long@btc.adaptec.com>
Cc: current@FreeBSD.org
Subject: Re: Tidying src/release/*/{dokern.sh,drivers.conf}
Message-ID: <20030518183910.GA25981@sunbay.com>
In-Reply-To: <3EC7B8B6.5090208@btc.adaptec.com>
References: <20030518083130.GD24393@sunbay.com> <3EC7B8B6.5090208@btc.adaptec.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 18, 2003 at 10:45:42AM -0600, Scott Long wrote: > Ruslan Ermilov wrote: > >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. > > >=20 > Is this an approval request? >=20 Yes, why not. > See below... >=20 > > > >Cheers, > > > > > >------------------------------------------------------------------------ > >[...] > >------------------------------------------------------------------------ > > > >Index: release/alpha/dokern.sh > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >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 > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >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' \ >=20 > Can you explain why you are prososing to add these devices back to > te BOOTMFS kernel? I assume that they were trimmed for a reason. >=20 This does NOT add any devices back, this just removes redundant lines from here: $ egrep -w 'apm|pmtimer' /sys/pc98/conf/GENERIC #device apm #device pmtimer > >Index: sys/alpha/conf/GENERIC > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >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=20 > >adapters > > device mpt # LSI-Logic MPT-Fusion > > #device ncr # NCR/Symbios Logic > > device sym # NCR/Symbios Logic (newer chipsets=20 > > + those of `ncr') > >Index: sys/i386/conf/GENERIC > >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >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=20 > > 900/SiS 7016 > >+device sk # SysKonnect SK-984x and SK-982x=20 > >gigabit ethernet > > device ste # Sundance ST201 (D-Link DFE-550TX) > >+device ti # Alteon Networks Tigon I/II gigabit=20 > >ethernet > > device tl # Texas Instruments ThunderLAN > > device tx # SMC EtherPower II (83c170 ``EPIC'') > > device vr # VIA Rhine, Rhine II >=20 > Adding these three device lines is probably ok. I spoke with Ken about > if_ti and he confirmed that there is no reason why it can't go into > GENERIC. --=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 --Nq2Wo0NMKNjxTN9z Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+x9NOUkv4P6juNwoRAmuSAJ9HrJYTxfapeRrAFPtZ/7pQabhwEACfUNOr Wm7PpXtvTnTmtw3xo/QcCvg= =pKuK -----END PGP SIGNATURE----- --Nq2Wo0NMKNjxTN9z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030518183910.GA25981>