From owner-cvs-all@FreeBSD.ORG Tue Apr 19 18:29:52 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F45C16A4CE; Tue, 19 Apr 2005 18:29:52 +0000 (GMT) Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id A207643D41; Tue, 19 Apr 2005 18:29:51 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1]) by dragon.NUXI.org (8.13.3/8.13.3) with ESMTP id j3JITdVW029625; Tue, 19 Apr 2005 11:29:39 -0700 (PDT) (envelope-from obrien@dragon.NUXI.org) Received: (from obrien@localhost) by dragon.NUXI.org (8.13.3/8.13.1/Submit) id j3JITdT8029624; Tue, 19 Apr 2005 11:29:39 -0700 (PDT) (envelope-from obrien) Date: Tue, 19 Apr 2005 11:29:38 -0700 From: "David O'Brien" To: Warner Losh , ru@freebsd.org Message-ID: <20050419182938.GA27941@dragon.NUXI.org> References: <200504182110.j3ILAc8J031298@repoman.freebsd.org> <20050418.152011.74745144.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050418.152011.74745144.imp@bsdimp.com> X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.9i cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/conf kmod.mk X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@freebsd.org List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2005 18:29:52 -0000 On Mon, Apr 18, 2005 at 03:20:11PM -0600, Warner Losh wrote: > From: "David E. O'Brien" > Subject: cvs commit: src/sys/conf kmod.mk > Date: Mon, 18 Apr 2005 21:10:38 +0000 (UTC) > > > obrien 2005-04-18 21:10:38 UTC > > > > FreeBSD src repository > > > > Modified files: > > sys/conf kmod.mk > > Log: > > As with kernel-depend, rm the DEPENDFILE before modules-depend. > > Why not cleandepend? +# $FreeBSD: src/sys/conf/kmod.mk,v 1.189 2005/04/18 21:10:38 obrien Exp +beforedepend: cleandepend :-) On Tue, Apr 19, 2005 at 04:38:56PM +0300, Ruslan Ermilov wrote: > On Mon, Apr 18, 2005 at 09:10:38PM +0000, David E. O'Brien wrote: > > obrien 2005-04-18 21:10:38 UTC > > Modified files: > > sys/conf kmod.mk > > Log: > > As with kernel-depend, rm the DEPENDFILE before modules-depend. > > Revision Changes Path > > 1.189 +2 -1 src/sys/conf/kmod.mk > Is this supposed to fix a failure of a NO_CLEAN buildkernel and seeing > it breaks due to a stale header recorded into .depend? > I don't like this change, as it causes two consequent make's to > redundantly rebuild .depend files (a lot of, now), as with a kernel > object build. Instead, one should NOT rely on using NO_CLEAN when > updating sources -- we never guaranteed it should always work. Almost, but not quite. I wasn't using 'NO_CLEAN'. > Something more clever is needed. How about preserving what you did, > but also adding NO_CLEANDEPEND so that .depend files are not removed > when this option is present (useful when you do incremental builds > without source updates). You can totally back out my commit, if you can fix the situation I've run into several times after the bus_.h change. I know what the basic issue is, but I thought dealing with it a better way would take considerable work. The problem to fix is: cd into the kernel build directory, issue 'make depend && make' and then get a build failure that make doesn't know how to build bus_amd64.h. I don't think having to add 'find . .depend -delete' or 'rm -rf modules' before the 'make depend' is OK. :-) -- -- David (obrien@FreeBSD.org)