From 24c1eacf01be5ddb85d9517abbda147c05507d94 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 8 Mar 2015 14:39:12 +0100 Subject: [PATCH] Fix lack of buildworld and quickworld messages The "world" target has a nice start/stop message. However, if somebody chooses to use "make buildworld" followed by "make installworld" rather than "make world", they get no messages at all. I think this has been an ongoing oversight. This commit improves the "world" target messages (e.g. all targets are ELF so don't need to specify that, and pre/post-world targets are shown.) More importantly it adds start/complete messages to buildworld, and start message to installworld. The installworld already had a complete message, but this was redone to match the format of the other ones. Similar messages were added to quickworld and realquickworld targets too. --- Makefile | 14 ++++++++++---- Makefile.inc1 | 41 ++++++++++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 0d6b9c09a6..25657f8569 100644 --- a/Makefile +++ b/Makefile @@ -128,27 +128,33 @@ STARTTIME!= LC_ALL=C date # world: @echo "--------------------------------------------------------------" - @echo ">>> elf make world started on ${STARTTIME}" + @echo ">>> make world started on ${STARTTIME}" @echo "--------------------------------------------------------------" .if target(pre-world) @echo @echo "--------------------------------------------------------------" - @echo ">>> Making 'pre-world' target" + @echo ">>> starting pre-world target" @echo "--------------------------------------------------------------" @cd ${.CURDIR}; ${MAKE} pre-world + @echo "--------------------------------------------------------------" + @echo ">>> pre-world target complete" + @echo "--------------------------------------------------------------" .endif @cd ${.CURDIR}; ${MAKE} buildworld @cd ${.CURDIR}; ${MAKE} -B installworld .if target(post-world) @echo @echo "--------------------------------------------------------------" - @echo ">>> Making 'post-world' target" + @echo ">>> starting post-world target" @echo "--------------------------------------------------------------" @cd ${.CURDIR}; ${MAKE} post-world + @echo "--------------------------------------------------------------" + @echo ">>> post-world target complete" + @echo "--------------------------------------------------------------" .endif @echo @echo "--------------------------------------------------------------" - @printf ">>> elf make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" + @printf ">>> make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" @echo "--------------------------------------------------------------" # diff --git a/Makefile.inc1 b/Makefile.inc1 index c9d58d6b00..aee1a3a92c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -421,6 +421,26 @@ everything: @echo ">>> stage 4d: building everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} all +_bwinit: + @echo "--------------------------------------------------------------" + @echo ">>> starting buildworld target" + @echo "--------------------------------------------------------------" +_bwdone: + @echo "--------------------------------------------------------------" + @echo ">>> buildworld target complete" + @echo "--------------------------------------------------------------" +_qwinit: + @echo "--------------------------------------------------------------" + @echo ">>> starting quickworld target" + @echo "--------------------------------------------------------------" +_qwdone: + @echo "--------------------------------------------------------------" + @echo ">>> quickworld target complete" + @echo "--------------------------------------------------------------" +_iwinit: + @echo "--------------------------------------------------------------" + @echo ">>> starting installworld target" + @echo "--------------------------------------------------------------" # note: buildworld no longer depends on _cleanobj because we rm -rf the # entire object tree and built the bootstrap tools in a different location. @@ -442,25 +462,26 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -buildworld: ${WMAKE_TGTS} +buildworld: _bwinit ${WMAKE_TGTS} _bwdone -quickworld: _mtreetmp _obj _includes _libraries _depend everything +quickworld: _qwinit _mtreetmp _obj _includes _libraries _depend everything _qwdone -realquickworld: _mtreetmp _obj _includes _libraries everything +realquickworld: _qwinit _mtreetmp _obj _includes _libraries everything _qwdone crossworld: _worldtmp _bootstrap-tools _obj _build-tools _cross-tools -.ORDER: ${WMAKE_TGTS} +.ORDER: _bwinit ${WMAKE_TGTS} _bwdone .ORDER: _obj _includes -.ORDER: _mtreetmp _obj +.ORDER: _qwinit _mtreetmp _obj .ORDER: installcheck backupworld-auto +.ORDER: everything _qwdone # # installcheck # # Checks to be sure system is ready for installworld # -installcheck: +installcheck: _iwinit .if !defined(NO_SENDMAIL) @pw usershow smmsp || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) @pw groupshow smmsp || (echo "You may need to run 'make preupgrade' first"; /usr/bin/false) @@ -493,9 +514,11 @@ installworld: installcheck cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} ${INSTALL} -o root -g wheel -m 644 ${.CURDIR}/Makefile_upgrade.inc ${DESTDIR}/etc/upgrade/ sync - @echo "installworld is done. If things work as expected after a" - @echo "full reboot, consider updating the rescue image with" - @echo "'make rescue'. Do not do it until after rebooting." + @echo "--------------------------------------------------------------" + @echo ">>> installworld target complete" + @echo "--------------------------------------------------------------" + @echo "If things work as expected after a full reboot, consider updating the rescue" + @echo "image with 'make rescue'. Do not do it until after rebooting." installworld-force: @echo "Doing a forced installworld. This will install to a temporary directory," -- 2.41.0