From owner-cvs-src@FreeBSD.ORG Wed Apr 20 05:59:08 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E600116A4CE; Wed, 20 Apr 2005 05:59:07 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A1A743D41; Wed, 20 Apr 2005 05:59:07 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j3K626PP048461; Wed, 20 Apr 2005 09:02:06 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 06948-13; Wed, 20 Apr 2005 08:59:00 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j3K624QE048457 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 20 Apr 2005 09:02:05 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.3/8.13.3) id j3K5x5om033050; Wed, 20 Apr 2005 08:59:05 +0300 (EEST) (envelope-from ru) Date: Wed, 20 Apr 2005 08:59:05 +0300 From: Ruslan Ermilov To: "David O'Brien" Message-ID: <20050420055904.GA33015@ip.net.ua> References: <200504182110.j3ILAc8J031298@repoman.freebsd.org> <20050418.152011.74745144.imp@bsdimp.com> <20050419182938.GA27941@dragon.NUXI.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="sdtB3X0nJg68CQEu" Content-Disposition: inline In-Reply-To: <20050419182938.GA27941@dragon.NUXI.org> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org cc: Warner Losh Subject: Re: cvs commit: src/sys/conf kmod.mk X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 05:59:08 -0000 --sdtB3X0nJg68CQEu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 19, 2005 at 11:29:38AM -0700, David O'Brien wrote: > 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) > >=20 > > > obrien 2005-04-18 21:10:38 UTC > > >=20 > > > FreeBSD src repository > > >=20 > > > Modified files: > > > sys/conf kmod.mk=20 > > > Log: > > > As with kernel-depend, rm the DEPENDFILE before modules-depend. > >=20 > > Why not cleandepend? >=20 > +# $FreeBSD: src/sys/conf/kmod.mk,v 1.189 2005/04/18 21:10:38 obrien = Exp > +beforedepend: cleandepend >=20 > :-) >=20 > 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=20 > > > 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. >=20 > Almost, but not quite. I wasn't using 'NO_CLEAN'. >=20 > > 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). >=20 > 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. >=20 > 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. >=20 > I don't think having to add 'find . .depend -delete' or 'rm -rf modules' > before the 'make depend' is OK. :-) >=20 This is easily fixable: make cleandepend make depend make Note that the 1st step is only necessary between source upgrades, hence I don't like it to be done unconditionally (as this change does). Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --sdtB3X0nJg68CQEu Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFCZe+oqRfpzJluFF4RAroxAJ4tTcpATchhv0ijDdRC5BWtKoBewgCfYOJl px0RVO5i6CIwOdMGOizTA2E= =5moW -----END PGP SIGNATURE----- --sdtB3X0nJg68CQEu--