d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installworld when nmtree is not on the host by only adding it to

Browse Source 
ITOOLS when we will be using the host copy.

Fix installkernel when -DNO_ROOT is set.
This commit is contained in:
Brooks Davis 2013-01-29 21:48:10 +00:00
parent 1910bfcba2
commit beb7ecad2b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -673,8 +673,8 @@ _zoneinfo= zic tzsetup
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
date echo egrep find grep id install ${_install-info} \ date echo egrep find grep id install ${_install-info} \
ln lockf make mkdir mtree mv nmtree pwd_mkdb rm sed sh sysctl \ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
test true uname wc ${_zoneinfo} rm sed sh sysctl test true uname wc ${_zoneinfo}
# #
# distributeworld # distributeworld
@ -964,7 +964,7 @@ reinstallkernel reinstallkernel.debug: installcheck
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \ ${CROSSENV} PATH=${TMPPATH} \
${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
distributekernel distributekernel.debug: distributekernel distributekernel.debug:
.if empty(INSTALLKERNEL) .if empty(INSTALLKERNEL)
@ -1132,6 +1132,8 @@ _yacc= usr.bin/yacc
.if ${BOOTSTRAPPING} < 1000026 .if ${BOOTSTRAPPING} < 1000026
_nmtree= lib/libnetbsd \ _nmtree= lib/libnetbsd \
usr.sbin/nmtree usr.sbin/nmtree
.else
_nmtree_itools= nmtree
.endif .endif
.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041