Date: Tue, 10 Feb 2015 22:05:58 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278540 - projects/release-pkg Message-ID: <201502102205.t1AM5wsi051134@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Feb 10 22:05:57 2015 New Revision: 278540 URL: https://svnweb.freebsd.org/changeset/base/278540 Log: Add a new target make stageworld which basically does the same job as: make installworld distribution but preparing the mtree the same way distributeworld does and respecting -DNO_ROOT Modified: projects/release-pkg/Makefile projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Tue Feb 10 22:04:41 2015 (r278539) +++ projects/release-pkg/Makefile Tue Feb 10 22:05:57 2015 (r278540) @@ -113,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ - xdev-links native-xtools kernel-pkgs \ + xdev-links native-xtools kernel-pkgs stageworld \ TGTS+= ${SUBDIR_TARGETS} Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Tue Feb 10 22:04:41 2015 (r278539) +++ projects/release-pkg/Makefile.inc1 Tue Feb 10 22:05:57 2015 (r278540) @@ -215,7 +215,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} # It may not be functional, e.g., due to new ABI # when in the middle of installing over this system. # -.if make(distributeworld) || make(installworld) +.if make(distributeworld) || make(installworld) || make(stageworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install .endif @@ -842,7 +842,7 @@ DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTR MTREE_MAGIC?= mtree 2.0 -distributeworld installworld: _installcheck_world +distributeworld installworld stageworld: _installcheck_world mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ @@ -978,6 +978,20 @@ reinstall: .MAKE ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif +restage: .MAKE + @echo "--------------------------------------------------------------" + @echo ">>> Making hierarchy" + @echo "--------------------------------------------------------------" + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Installing everything" + @echo "--------------------------------------------------------------" + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if defined(LIB32TMP) && ${MK_LIB32} != "no" + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 +.endif redistribute: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Distributing everything"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502102205.t1AM5wsi051134>