Date: Wed, 20 Apr 2005 08:59:05 +0300 From: Ruslan Ermilov <ru@freebsd.org> To: "David O'Brien" <obrien@freebsd.org> Cc: Warner Losh <imp@bsdimp.com> Subject: Re: cvs commit: src/sys/conf kmod.mk Message-ID: <20050420055904.GA33015@ip.net.ua> In-Reply-To: <20050419182938.GA27941@dragon.NUXI.org> References: <200504182110.j3ILAc8J031298@repoman.freebsd.org> <20050418.152011.74745144.imp@bsdimp.com> <20050419182938.GA27941@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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" <obrien@freebsd.org> > > 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_<arch>.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. :-) > 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, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFCZe+oqRfpzJluFF4RAroxAJ4tTcpATchhv0ijDdRC5BWtKoBewgCfYOJl px0RVO5i6CIwOdMGOizTA2E= =5moW -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050420055904.GA33015>