Author: brooks
Date: Tue Jan 29 21:48:10 2013
New Revision: 246096
URL: http://svnweb.freebsd.org/changeset/base/246096
Log:
Fix installworld when nmtree is not on the host by only adding it to
ITOOLS when we will be using the host copy.
Fix installkernel when -DNO_ROOT is set.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Jan 29 21:44:22 2013 (r246095)
+++ head/Makefile.inc1 Tue Jan 29 21:48:10 2013 (r246096)
@@ -673,8 +673,8 @@ _zoneinfo= zic tzsetup
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep id install ${_install-info} \
- ln lockf make mkdir mtree mv nmtree pwd_mkdb rm sed sh sysctl \
- test true uname wc ${_zoneinfo}
+ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
+ rm sed sh sysctl test true uname wc ${_zoneinfo}
#
# distributeworld
@@ -964,7 +964,7 @@ reinstallkernel reinstallkernel.debug: i
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \
- ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
+ ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}
${.TARGET:S/kernel//}
distributekernel distributekernel.debug:
.if empty(INSTALLKERNEL)
@@ -1132,6 +1132,8 @@ _yacc= usr.bin/yacc
.if ${BOOTSTRAPPING} < 1000026
_nmtree= lib/libnetbsd \
usr.sbin/nmtree
+.else
+_nmtree_itools= nmtree
.endif
.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
