hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-25 10:01:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Makefile.inc1: show time for `make installworld'"

Browse Source 
It broke `make packages`, so revert until that can be fixed.

This reverts commit e5a0202f96.

Reported by:	bapt, theraven
This commit is contained in:
Ed Maste 2024-07-15 09:49:26 -04:00
parent 001606523a
commit 867873b398
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.inc1
View File

@ -1241,19 +1241,11 @@ WMAKE_TGTS+= build${libcompat}
.endif .endif
WMAKE_TGTS+= everything WMAKE_TGTS+= everything
# record buildworld / install time in seconds # record buildworld time in seconds
.if make(buildworld) .if make(buildworld)
_BUILDWORLD_START!= date '+%s' _BUILDWORLD_START!= date '+%s'
.export _BUILDWORLD_START .export _BUILDWORLD_START
.endif .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 buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue .PHONY
.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue .ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
@ -1321,11 +1313,11 @@ kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} .PHONY
installcheck: _installcheck_world _installcheck_kernel .PHONY installcheck: _installcheck_world _installcheck_kernel .PHONY
_installcheck_world: .PHONY _installcheck_world: .PHONY
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Install check world started on `LC_ALL=C date`" @echo ">>> Install check world"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
_installcheck_kernel: .PHONY _installcheck_kernel: .PHONY
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Install check kernel started on `LC_ALL=C date`" @echo ">>> Install check kernel"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
# #
@ -1649,8 +1641,6 @@ restage reinstall: .MAKE .PHONY
.endfor .endfor
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Installing everything completed on `LC_ALL=C date`" @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 "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
redistribute: .MAKE .PHONY redistribute: .MAKE .PHONY
@ -1883,9 +1873,6 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)" @echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------" @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 .endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
.for _kernel in ${BUILDKERNELS:[2..-1]} .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 ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
.endfor .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 .endif
distributekernel distributekernel.debug: .PHONY distributekernel distributekernel.debug: .PHONY