Date: Fri, 10 Mar 2006 03:46:23 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 93091 for review Message-ID: <200603100346.k2A3kNdK056133@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=93091 Change 93091 by soc-andrew@soc-andrew_serv on 2006/03/10 03:46:06 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#36 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -824,6 +824,10 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif +.if ${BOOTSTRAPPING} < 700014 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -839,6 +843,7 @@ usr.bin/rpcgen \ usr.bin/xinstall \ usr.sbin/config \ + ${_gensnmptree} \ ${_crunchgen} \ ${_pwd_mkdb} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.900 2006/03/08 18:02:30 sam Exp $ +# $FreeBSD: src/release/Makefile,v 1.902 2006/03/09 17:55:08 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -177,10 +177,9 @@ # Build and package both GENERIC and SMP kernels if the target # has both configuration files. Otherwise only GENERIC is done. # -.if !exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) -KERNELS?= GENERIC -.else -KERNELS?= GENERIC SMP +KERNELS+= GENERIC +.if exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) +KERNELS+= SMP .endif # mountpoint for filesystems.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603100346.k2A3kNdK056133>