diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-02-10 22:05:57 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-02-10 22:05:57 +0000 |
| commit | c69a9896cb30187a47a11743ea4743f905b4e304 (patch) | |
| tree | 9336c2eecf5a780619d2c049ca84ea7c4e56aef8 | |
| parent | 480180df52fdcb214eaf8d3b302157ce37928532 (diff) | |
| download | src-c69a9896cb30187a47a11743ea4743f905b4e304.tar.gz src-c69a9896cb30187a47a11743ea4743f905b4e304.zip | |
Notes
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.inc1 | 18 |
2 files changed, 17 insertions, 3 deletions
@@ -113,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ _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} diff --git a/Makefile.inc1 b/Makefile.inc1 index bbae094c3ba9..cae2f22f7e3f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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_DISTRIBUTIONS:S,doc,,} 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" |