Date: Fri, 15 Mar 2002 15:30:52 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Takahashi Yoshihiro <nyan@jp.FreeBSD.org> Cc: matusita@jp.FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/sysinstall Makefile Message-ID: <20020315133052.GB50745@sunbay.com> In-Reply-To: <20020315.211810.74739673.nyan@jp.FreeBSD.org> References: <200203151127.g2FBRlM03640@freefall.freebsd.org> <20020315210448K.matusita@jp.FreeBSD.org> <20020315121130.GA50745@sunbay.com> <20020315.211810.74739673.nyan@jp.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Mar 15, 2002 at 09:18:10PM +0900, Takahashi Yoshihiro wrote: > In article <20020315121130.GA50745@sunbay.com> > Ruslan Ermilov <ru@FreeBSD.org> writes: > > > > It is very natual to do that, since sysinstall *really* neads boot0 > > > and its friends to make sysinstall itself. Why you don't like that? > > > > > I'd be happy to look at the patch, please repost the URL. > > http://docs.FreeBSD.org/cgi/getmsg.cgi?fetch=441775+0+current/freebsd-stable > OK, how about this? I don't like building all of the "sys/boot" in advance. Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.241 diff -u -r1.241 Makefile.inc1 --- Makefile.inc1 6 Mar 2002 08:24:32 -0000 1.241 +++ Makefile.inc1 15 Mar 2002 13:27:26 -0000 @@ -288,6 +288,11 @@ cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries @echo @echo "--------------------------------------------------------------" + @echo ">>> stage 4: building boot images" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${WMAKE} boot-images + @echo + @echo "--------------------------------------------------------------" @echo ">>> stage 4: make dependencies" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-depend @@ -783,6 +788,23 @@ ${MAKE} all; \ ${MAKE} install .endif +.endfor + +# +# boot-images - build boot images needed for sysinstall(8). +# +.if ${MACHINE_ARCH} == "i386" +_boot0= sys/boot/${MACHINE}/boot0 +.if ${MACHINE} == "i386" +_mbr= sys/boot/i386/mbr +.elif ${MACHINE} == "pc98" +_boot0.5= sys/boot/pc98/boot0.5 +.endif +.endif + +boot-images: +.for _image in ${_boot0} ${_mbr} ${_boot0.5} + cd ${.CURDIR}/${_image}; ${MAKE} all .endfor .for __target in clean cleandepend cleandir depend obj Index: usr.sbin/sysinstall/Makefile =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/Makefile,v retrieving revision 1.121 diff -u -r1.121 Makefile --- usr.sbin/sysinstall/Makefile 15 Mar 2002 11:27:47 -0000 1.121 +++ usr.sbin/sysinstall/Makefile 15 Mar 2002 13:27:26 -0000 @@ -55,10 +55,7 @@ >> makedevs.c .if ${MACHINE_ARCH} == i386 -# XXX boot images aren't yet ready when "make depend" is run -.if !make(depend) SRCS+= makeboot.c -.endif CLEANFILES+= makeboot.c .if exists(${.OBJDIR}/../../sys/boot/${MACHINE}/boot0/boot0) BOOT0= ${.OBJDIR}/../../sys/boot/${MACHINE}/boot0/boot0 Cheers, -- Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020315133052.GB50745>