From owner-freebsd-questions Thu Nov 22 6:13: 0 2001 Delivered-To: freebsd-questions@freebsd.org Received: from dire.bris.ac.uk (dire.bris.ac.uk [137.222.10.60]) by hub.freebsd.org (Postfix) with ESMTP id 9363B37B405 for ; Thu, 22 Nov 2001 06:12:56 -0800 (PST) Received: from mail.ilrt.bris.ac.uk by dire.bris.ac.uk with SMTP-PRIV with ESMTP; Thu, 22 Nov 2001 14:12:30 +0000 Received: from cmjg (helo=localhost) by mail.ilrt.bris.ac.uk with local-esmtp (Exim 3.16 #1) id 166uYp-0002yn-00; Thu, 22 Nov 2001 14:10:39 +0000 Date: Thu, 22 Nov 2001 14:10:39 +0000 (GMT) From: Jan Grant X-X-Sender: To: Anthony Atkielski Cc: Kelly Hendrix , FreeBSD Questions Subject: Re: Error on xl0 In-Reply-To: <021001c17359$5fa61cd0$0a00000a@atkielski.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 22 Nov 2001, Anthony Atkielski wrote: > Jan writes: > > > If you've made changes to GENERIC, then you'll > > lose them and/or confuse CVS. If you've copied > > GENERIC to a new kernal config file and made the > > changes to that, cvsup by default won't delete > > that; however, changes to GENERIC won't be tracked > > into your new kernel config. > > I've copied the configuration to my own configuration file, so > that's not a problem, presumably. The thing is, now I've changed > one of the source files to redefine an internal parameter ... so how > do I keep that change to that particular source file > (/sys/pci/if_xlreg.h), and also make sure that it doesn't interfere > with the standard source? That, of course, depends. If your changes are a bugfix or a feature enhancement then the simplest course may be to send-pr the diffs and get them folded in to the main source. That means you've one less thing to worry about looking after :-) Otherwise, your options depend on how much source hackery you're planning on performing. If you've just got a small number of diffs that you'd like to apply then the line of least resistance may be to wrap your invocation of cvsup with a script that sticks your local fixes in place (that's what I do here). If you're planning on large-scale changes, you'll probably want to look at running your own copy of the CVS repository. -- jan grant, ILRT, University of Bristol. http://www.ilrt.bris.ac.uk/ Tel +44(0)117 9287088 Fax +44 (0)117 9287112 RFC822 jan.grant@bris.ac.uk There's no convincing English-language argument that this sentence is true. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message