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

Add a new target make stageworld which basically does the same job as:

Browse Source 
make installworld distribution but preparing the mtree the same way
distributeworld does and respecting -DNO_ROOT
This commit is contained in:
Baptiste Daroussin 2015-02-10 22:05:57 +00:00
parent 480180df52
commit c69a9896cb
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -113,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \ _build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ 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} TGTS+= ${SUBDIR_TARGETS}

18
Makefile.inc1
View File

@ -215,7 +215,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH}
# It may not be functional, e.g., due to new ABI # It may not be functional, e.g., due to new ABI
# when in the middle of installing over this system. # 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 INSTALLTMP!= /usr/bin/mktemp -d -u -t install
.endif .endif
@ -842,7 +842,7 @@ DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,}
MTREE_MAGIC?= mtree 2.0 MTREE_MAGIC?= mtree 2.0
distributeworld installworld: _installcheck_world distributeworld installworld stageworld: _installcheck_world
mkdir -p ${INSTALLTMP} mkdir -p ${INSTALLTMP}
progs=$$(for prog in ${ITOOLS}; do \ progs=$$(for prog in ${ITOOLS}; do \
if progpath=`which $$prog`; then \ if progpath=`which $$prog`; then \
@ -978,6 +978,20 @@ reinstall: .MAKE
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif .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 redistribute: .MAKE
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Distributing everything" @echo ">>> Distributing everything"