cvs commit: src/sys/conf kmod.mk

[Ruslan Ermilov]

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 at 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 at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20050420/0a3e2b2f/attachment.bin