Date: Fri, 1 Feb 2013 18:37:13 +0300 From: Sergey Kandaurov <pluknet@gmail.com> To: Warner Losh <imp@freebsd.org> Cc: freebsd-stable <freebsd-stable@freebsd.org> Subject: Re: svn commit: r200596 - head Message-ID: <CAE-mSOK82Wwh6aRz5-6tqH0r9j8U6_majxKOHfJ5%2BJkvwg0_6A@mail.gmail.com> In-Reply-To: <200912160254.nBG2sYLP082659@svn.freebsd.org> References: <200912160254.nBG2sYLP082659@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 16 December 2009 05:54, Warner Losh <imp@freebsd.org> wrote: > Author: imp > Date: Wed Dec 16 02:54:34 2009 > New Revision: 200596 > URL: http://svn.freebsd.org/changeset/base/200596 > > Log: > Add NO_KERNELOBJ flag, similar to NO_KERNEL{CONFIG,DEPEND,CLEAN}, > which disables doing a make obj. Use it when you know it will work > only. KERNFAST now implies NO_KERNELOBJ, since you don't need to keep > doing obj when doing incremental kernel builds. Hi. Would you mind if I merge this to stable/8? > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Wed Dec 16 02:52:33 2009 (r200595) > +++ head/Makefile.inc1 Wed Dec 16 02:54:34 2009 (r200596) > @@ -5,10 +5,11 @@ > # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir > # -DNO_CLEAN do not clean at all > # -DNO_SHARE do not go into share subdir > -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND > +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} > # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel > # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel > # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel > +# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel > # -DNO_PORTSUPDATE do not update ports in ${MAKE} update > # -DNO_DOCUPDATE do not update doc in ${MAKE} update > # -DNO_CTF do not run the DTrace CTF conversion tools on built objects > @@ -694,6 +695,7 @@ distrib-dirs distribution: > NO_KERNELCLEAN= t > NO_KERNELCONFIG= t > NO_KERNELDEPEND= t > +NO_KERNELOBJ= t > # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah > .if !defined(KERNCONF) && ${KERNFAST} != "1" > KERNCONF=${KERNFAST} > @@ -763,11 +765,13 @@ buildkernel: > @echo "--------------------------------------------------------------" > cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} > .endif > +.if !defined(NO_KERNELOBJ) > @echo > @echo "--------------------------------------------------------------" > @echo ">>> stage 2.2: rebuilding the object tree" > @echo "--------------------------------------------------------------" > cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj > +.endif > @echo > @echo "--------------------------------------------------------------" > @echo ">>> stage 2.3: build tools" > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- wbr, pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSOK82Wwh6aRz5-6tqH0r9j8U6_majxKOHfJ5%2BJkvwg0_6A>