Date: Wed, 18 May 2016 17:08:29 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300159 - head Message-ID: <201605181708.u4IH8Tdr055365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed May 18 17:08:29 2016 New Revision: 300159 URL: https://svnweb.freebsd.org/changeset/base/300159 Log: Combine restage/reinstall in a safe way. Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed May 18 16:25:34 2016 (r300158) +++ head/Makefile.inc1 Wed May 18 17:08:29 2016 (r300159) @@ -975,27 +975,19 @@ packageworld: .PHONY # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: .MAKE .PHONY +restage reinstall: .MAKE .PHONY @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy - @echo +.if make(restage) @echo "--------------------------------------------------------------" - @echo ">>> Installing everything" - @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 ">>> Making distribution" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution + LOCAL_MTREE=${LOCAL_MTREE:Q} distribution +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605181708.u4IH8Tdr055365>