Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Dec 2007 07:55:30 +1100
From:      Peter Jeremy <peterjeremy@optushome.com.au>
To:        "Matthew D. Fuller" <fullermd@over-yonder.net>
Cc:        freebsd-current@freebsd.org, Robert Watson <rwatson@freebsd.org>
Subject:   Re: Kernel configging (was Re: -CURRENT buildkernel failure)
Message-ID:  <20071130205529.GV50167@server.vk2pj.dyndns.org>
In-Reply-To: <20071129220753.GB31891@over-yonder.net>
References:  <20071129140140.1f6bb021@Winter> <20071129145938.GA5751@mugin.localhost> <20071129215656.E7555@fledge.watson.org> <20071129220753.GB31891@over-yonder.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--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--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071130205529.GV50167>