As threatened in hackers@ on Friday, obviate the need for a buildworld
to preceed a buildkernel. The buildworld is still required when upgrading across major releases, across binutil upgrades and when config changes version. If buildkernel breaks, and you haven't done a buildworld, then do not complain unless you do a buildworld and it still breaks.
This commit is contained in:
parent
1e15924872
commit
5963db0f2e
@ -129,6 +129,7 @@ WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH}
|
||||
# /usr/games added for fortune which depend on strfile
|
||||
STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
|
||||
TMPPATH= ${STRICTTMPPATH}:${PATH}
|
||||
OBJFORMAT_PATH?= /usr/libexec
|
||||
|
||||
TMPDIR?= /tmp
|
||||
TMPPID!= echo $$$$
|
||||
@ -200,6 +201,10 @@ IMAKEENV= ${CROSSENV} \
|
||||
PATH=${STRICTTMPPATH}:${INSTALLTMP}
|
||||
IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
|
||||
|
||||
# kernel stage
|
||||
KMAKEENV= ${WMAKEENV} \
|
||||
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:${OBJFORMAT_PATH}
|
||||
|
||||
USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
|
||||
usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc
|
||||
|
||||
@ -408,10 +413,10 @@ buildkernel:
|
||||
${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
|
||||
.if !defined(NO_KERNELDEPEND)
|
||||
cd ${KRNLOBJDIR}/${_kernel}; \
|
||||
${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} depend
|
||||
${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} depend
|
||||
.endif
|
||||
cd ${KRNLOBJDIR}/${_kernel}; \
|
||||
${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} all
|
||||
${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} all
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Kernel build for ${_kernel} completed on `LC_TIME=C date`"
|
||||
@echo "--------------------------------------------------------------"
|
||||
|
Loading…
Reference in New Issue
Block a user