From owner-freebsd-current@FreeBSD.ORG Sun May 18 13:28:11 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47BFE37B401; Sun, 18 May 2003 13:28:11 -0700 (PDT) Received: from magic.adaptec.com (magic-mail.adaptec.com [208.236.45.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83BFB43FBF; Sun, 18 May 2003 13:28:10 -0700 (PDT) (envelope-from scott_long@btc.adaptec.com) Received: from redfish.adaptec.com (redfish.adaptec.com [162.62.50.11]) by magic.adaptec.com (8.11.6/8.11.6) with ESMTP id h4IKO5Z27157; Sun, 18 May 2003 13:24:05 -0700 Received: from btc.adaptec.com (hollin.btc.adaptec.com [10.100.253.56]) by redfish.adaptec.com (8.8.8p2+Sun/8.8.8) with ESMTP id NAA25790; Sun, 18 May 2003 13:28:03 -0700 (PDT) Message-ID: <3EC7ECCF.9020809@btc.adaptec.com> Date: Sun, 18 May 2003 14:27:59 -0600 From: Scott Long User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3) Gecko/20030425 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Ruslan Ermilov References: <20030518183910.GA25981@sunbay.com> In-Reply-To: <20030518183910.GA25981@sunbay.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: re@FreeBSD.org cc: "Long, Scott" cc: current@FreeBSD.org Subject: Re: Tidying src/release/*/{dokern.sh,drivers.conf} X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2003 20:28:11 -0000 Ruslan Ermilov wrote: > 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=/usr/src/release. >>> >>>The patch that it "generates" is also attached. >>> >> >>Is this an approval request? >> > > Yes, why not. > > >>See below... >> >> >>>Cheers, >>> >>> >> >>----------------------------------------------------------------------- > > - > >>>[...] >> >>----------------------------------------------------------------------- > > - > >>>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' \ >> >>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. >> > > 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 > > This type of thing can probably distilled down to being a matter of personal style; I can see good reasons on both side of the argument. Lets hold off on this until after the release, or at least until after the release scripts have settled and work on all platforms. The second part of the patch that restored the ispfw, if_ti, and if_sk drivers to their respective GENERIC homes is approved. Scott