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

Save any binaries we use by installworld, so that we won't use the

Browse Source 
binaries we just installed. This allows a future upgrade target to
install a new system without intermediate reboots and also
prevents conflicts for parallel make runs where we might exec a
binary that's being installed at the same time.
This commit is contained in:
Marcel Moolenaar 2000-07-19 04:41:59 +00:00
parent 1038894eb0
commit 767ab900c6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.inc1
View File

@ -125,6 +125,10 @@ WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH}
STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
TMPPATH= ${STRICTTMPPATH}:${PATH} TMPPATH= ${STRICTTMPPATH}:${PATH}
TMPDIR?= /tmp
TMPPID!= echo $$$$
INSTALLTMP= ${TMPDIR}/install.${TMPPID}
# #
# Building a world goes through the following stages # Building a world goes through the following stages
# #
@ -186,7 +190,7 @@ WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1
# install stage # install stage
IMAKEENV= ${CROSSENV} \ IMAKEENV= ${CROSSENV} \
PATH=${TMPPATH} PATH=${STRICTTMPPATH}:${INSTALLTMP}
IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \ USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
@ -300,7 +304,14 @@ everything:
# Installs everything compiled by a 'buildworld'. # Installs everything compiled by a 'buildworld'.
# #
installworld: installworld:
mkdir -p ${INSTALLTMP}
for prog in [ cat chflags chown date echo egrep find grep install \
install-info ln make makewhatis mv perl rm sed sh sysctl test \
true uname zic; do \
cp `which $$prog` ${INSTALLTMP}; \
done
cd ${.CURDIR}; ${IMAKE} reinstall cd ${.CURDIR}; ${IMAKE} reinstall
rm -rf ${INSTALLTMP}
# #
# reinstall # reinstall
@ -497,7 +508,7 @@ _strfile= games/fortune/strfile
bootstrap-tools: bootstrap-tools:
.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.sbin/config \ .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.sbin/config \
gnu/usr.bin/gperf gnu/usr.bin/texinfo usr.sbin/mtree usr.sbin/mtree gnu/usr.bin/gperf gnu/usr.bin/texinfo
cd ${.CURDIR}/${_tool}; \ cd ${.CURDIR}/${_tool}; \
${MAKE} obj; \ ${MAKE} obj; \
${MAKE} depend; \ ${MAKE} depend; \