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

Combine restage/reinstall in a safe way.

Browse Source 
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-05-18 17:08:29 +00:00
parent 08907ec39d
commit ecb92e2d47
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.inc1
View File

@ -975,27 +975,19 @@ packageworld: .PHONY
# and do a 'make reinstall' on the *client* to install new binaries from the # and do a 'make reinstall' on the *client* to install new binaries from the
# most recent server build. # most recent server build.
# #
reinstall: .MAKE .PHONY restage reinstall: .MAKE .PHONY
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy" @echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
@echo .if make(restage)
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Installing everything" @echo ">>> Making distribution"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
.if defined(LIBCOMPAT)
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
.endif
restage: .MAKE .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution LOCAL_MTREE=${LOCAL_MTREE:Q} distribution
.endif
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Installing everything" @echo ">>> Installing everything"