From owner-freebsd-current@FreeBSD.ORG Fri Nov 30 20:55:38 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F397D16A419 for ; Fri, 30 Nov 2007 20:55:37 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from mail12.syd.optusnet.com.au (mail12.syd.optusnet.com.au [211.29.132.193]) by mx1.freebsd.org (Postfix) with ESMTP id 8C2D113C448 for ; Fri, 30 Nov 2007 20:55:37 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from server.vk2pj.dyndns.org (c220-239-20-82.belrs4.nsw.optusnet.com.au [220.239.20.82]) by mail12.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id lAUKtWSR027254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 1 Dec 2007 07:55:35 +1100 Received: from server.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by server.vk2pj.dyndns.org (8.14.1/8.14.1) with ESMTP id lAUKtVai022812; Sat, 1 Dec 2007 07:55:31 +1100 (EST) (envelope-from peter@server.vk2pj.dyndns.org) Received: (from peter@localhost) by server.vk2pj.dyndns.org (8.14.1/8.14.1/Submit) id lAUKtUR6022799; Sat, 1 Dec 2007 07:55:30 +1100 (EST) (envelope-from peter) Date: Sat, 1 Dec 2007 07:55:30 +1100 From: Peter Jeremy To: "Matthew D. Fuller" Message-ID: <20071130205529.GV50167@server.vk2pj.dyndns.org> References: <20071129140140.1f6bb021@Winter> <20071129145938.GA5751@mugin.localhost> <20071129215656.E7555@fledge.watson.org> <20071129220753.GB31891@over-yonder.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="z9sQuz+HmDh2hVO4" Content-Disposition: inline In-Reply-To: <20071129220753.GB31891@over-yonder.net> X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.16 (2007-06-09) Cc: freebsd-current@freebsd.org, Robert Watson Subject: Re: Kernel configging (was Re: -CURRENT buildkernel failure) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 30 Nov 2007 20:55:38 -0000 --z9sQuz+HmDh2hVO4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 29, 2007 at 04:07:53PM -0600, Matthew D. Fuller wrote: >What I do do these days, though, is use my choice of the current gen >of distributed VCS's (though it's almost an insultingly simple >use-case ;) to keep copies of GENERIC in one branch, and derive my >config from that. Since I use bits of NOTES as well as GENERIC, I find it easier to include the current $FreeBSD lines from GENERIC and both NOTES files in my local config file. I then have a shell script that extracts the $FreeBSD lines from my config file and cvs diffs them against the current GENERIC/NOTES versions. I then update my config file with any new $FreeBSD lines and include or ignore the actual config changes as appropriate. Given a list of local config files, the script is basically: cd /usr/src while file=3Dshift; do echo "######### Differences in $file" awk '$2 =3D=3D "$FreeBSD:" { print substr($3, 5, length($3) - 6), $4 }' = $file | while read x ver; do cvs -R diff -u -r$ver $x done done --=20 Peter Jeremy Please excuse any delays as the result of my ISP's inability to implement an MTA that is either RFC2821-compliant or matches their claimed behaviour. --z9sQuz+HmDh2hVO4 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFHUHjB/opHv/APuIcRAs1VAJ4qYS++8j6UZ/CaJ0B1w3zMQdoqXwCfeDOn JzhLrSDonXcS3//QqWSgJe8= =YTUI -----END PGP SIGNATURE----- --z9sQuz+HmDh2hVO4--