git: 867873b3980c - main - Revert "Makefile.inc1: show time for `make installworld'"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Jul 2024 13:51:39 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=867873b3980c42c379f1f0e6ac88d92337ddf5dd
commit 867873b3980c42c379f1f0e6ac88d92337ddf5dd
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-07-15 13:49:26 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-07-15 13:50:04 +0000
Revert "Makefile.inc1: show time for `make installworld'"
It broke `make packages`, so revert until that can be fixed.
This reverts commit e5a0202f96948a95bf1b879727e155a4f1d1da93.
Reported by: bapt, theraven
---
Makefile.inc1 | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 7ff961e22e7a..19ed923702b1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1241,19 +1241,11 @@ WMAKE_TGTS+= build${libcompat}
.endif
WMAKE_TGTS+= everything
-# record buildworld / install time in seconds
+# record buildworld time in seconds
.if make(buildworld)
_BUILDWORLD_START!= date '+%s'
.export _BUILDWORLD_START
.endif
-.if make(installworld)
-_INSTALLWORLD_START!= date '+%s'
-.export _INSTALLWORLD_START
-.endif
-.if make(installkernel)
-_INSTALLKERNEL_START!= date '+%s'
-.export _INSTALLKERNEL_START
-.endif
buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue .PHONY
.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
@@ -1321,11 +1313,11 @@ kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} .PHONY
installcheck: _installcheck_world _installcheck_kernel .PHONY
_installcheck_world: .PHONY
@echo "--------------------------------------------------------------"
- @echo ">>> Install check world started on `LC_ALL=C date`"
+ @echo ">>> Install check world"
@echo "--------------------------------------------------------------"
_installcheck_kernel: .PHONY
@echo "--------------------------------------------------------------"
- @echo ">>> Install check kernel started on `LC_ALL=C date`"
+ @echo ">>> Install check kernel"
@echo "--------------------------------------------------------------"
#
@@ -1649,8 +1641,6 @@ restage reinstall: .MAKE .PHONY
.endfor
@echo "--------------------------------------------------------------"
@echo ">>> Installing everything completed on `LC_ALL=C date`"
- @seconds=$$(($$(date '+%s') - ${_INSTALLWORLD_START})); \
- echo ">>> Install world completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
@echo "--------------------------------------------------------------"
redistribute: .MAKE .PHONY
@@ -1883,9 +1873,6 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------"
- @seconds=$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \
- echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
- @echo "--------------------------------------------------------------"
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
.for _kernel in ${BUILDKERNELS:[2..-1]}
@@ -1900,9 +1887,6 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------"
.endfor
- @seconds=$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \
- echo ">>> Install kernel(s) ${BUILDKERNELS} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
- @echo "--------------------------------------------------------------"
.endif
distributekernel distributekernel.debug: .PHONY