Date: Sun, 14 Jul 2024 20:12:37 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Wolfram Schneider <wosch@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: =?US-ASCII?Q?Re=3A_git=3A_e5a0202f9694_-_main_-_Makefile=2E?= =?US-ASCII?Q?inc1=3A_show_time_for__=60make_installworld=27?= Message-ID: <1A2FA96F-3AB4-4A8C-A64D-7C15C0AD49BB@FreeBSD.org> In-Reply-To: <202407131039.46DAdpeF060632@gitrepo.freebsd.org> References: <202407131039.46DAdpeF060632@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Le 13 juillet 2024 11:39:51 GMT+01:00, Wolfram Schneider <wosch@FreeBSD=2Eo= rg> a =C3=A9crit=C2=A0: >The branch main has been updated by wosch: > >URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3De5a0202f96948a95bf1b87= 9727e155a4f1d1da93 > >commit e5a0202f96948a95bf1b879727e155a4f1d1da93 >Author: Wolfram Schneider <wosch@FreeBSD=2Eorg> >AuthorDate: 2024-07-13 10:37:14 +0000 >Commit: Wolfram Schneider <wosch@FreeBSD=2Eorg> >CommitDate: 2024-07-13 10:37:14 +0000 > > Makefile=2Einc1: show time for `make installworld' > =20 > For years we display the time in seconds how long it takes to > run `make buildworld' (see PR 224433)=2E Now we will display the > time for "installworld" and "installkernel" as well=2E > =20 > e=2Eg=2E: > -------------------------------------------------------------- > >>> Installing everything completed on Sun Jul =C2=A07 16:11:37 UTC 2= 024 > >>> Install world completed in 110 seconds, ncpu: 2, make -j2 > -------------------------------------------------------------- > =20 > PR: 280187 > Approved by: imp > Differential Revision: https://reviews=2Efreebsd=2Eorg/D45912 >--- > Makefile=2Einc1 | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > >diff --git a/Makefile=2Einc1 b/Makefile=2Einc1 >index 19ed923702b1=2E=2E7ff961e22e7a 100644 >--- a/Makefile=2Einc1 >+++ b/Makefile=2Einc1 >@@ -1241,11 +1241,19 @@ WMAKE_TGTS+=3D build${libcompat} > =2Eendif > WMAKE_TGTS+=3D everything >=20 >-# record buildworld time in seconds >+# record buildworld / install time in seconds > =2Eif make(buildworld) > _BUILDWORLD_START!=3D date '+%s' > =2Eexport _BUILDWORLD_START > =2Eendif >+=2Eif make(installworld) >+_INSTALLWORLD_START!=3D date '+%s' >+=2Eexport _INSTALLWORLD_START >+=2Eendif >+=2Eif make(installkernel) >+_INSTALLKERNEL_START!=3D date '+%s' >+=2Eexport _INSTALLKERNEL_START >+=2Eendif >=20 > buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue =2EPHO= NY > =2EORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue >@@ -1313,11 +1321,11 @@ kernel-toolchain: ${KERNEL_TOOLCHAIN_TGTS} =2EPHO= NY > installcheck: _installcheck_world _installcheck_kernel =2EPHONY > _installcheck_world: =2EPHONY > @echo "--------------------------------------------------------------" >- @echo ">>> Install check world" >+ @echo ">>> Install check world started on `LC_ALL=3DC date`" > @echo "--------------------------------------------------------------" > _installcheck_kernel: =2EPHONY > @echo "--------------------------------------------------------------" >- @echo ">>> Install check kernel" >+ @echo ">>> Install check kernel started on `LC_ALL=3DC date`" > @echo "--------------------------------------------------------------" >=20 > # >@@ -1641,6 +1649,8 @@ restage reinstall: =2EMAKE =2EPHONY > =2Eendfor > @echo "--------------------------------------------------------------" > @echo ">>> Installing everything completed on `LC_ALL=3DC date`" >+ @seconds=3D$$(($$(date '+%s') - ${_INSTALLWORLD_START})); \ >+ echo ">>> Install world completed in $$seconds seconds, ncpu: $$(${_n= cpu_cmd})${=2EMAKE=2EJOBS:S/^/, make -j/}" > @echo "--------------------------------------------------------------" >=20 > redistribute: =2EMAKE =2EPHONY >@@ -1873,6 +1883,9 @@ reinstallkernel reinstallkernel=2Edebug: _installch= eck_kernel =2EPHONY > @echo "--------------------------------------------------------------" > @echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=3D= C date)" > @echo "--------------------------------------------------------------" >+ @seconds=3D$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \ >+ echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds s= econds, ncpu: $$(${_ncpu_cmd})${=2EMAKE=2EJOBS:S/^/, make -j/}" >+ @echo "--------------------------------------------------------------" > =2Eendif > =2Eif ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} !=3D "yes" > =2Efor _kernel in ${BUILDKERNELS:[2=2E=2E-1]} >@@ -1887,6 +1900,9 @@ reinstallkernel reinstallkernel=2Edebug: _installch= eck_kernel =2EPHONY > @echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=3DC date= )" > @echo "--------------------------------------------------------------" > =2Eendfor >+ @seconds=3D$$(($$(date '+%s') - ${_INSTALLKERNEL_START})); \ >+ echo ">>> Install kernel(s) ${BUILDKERNELS} completed in $$seconds se= conds, ncpu: $$(${_ncpu_cmd})${=2EMAKE=2EJOBS:S/^/, make -j/}" >+ @echo "--------------------------------------------------------------" > =2Eendif >=20 > distributekernel distributekernel=2Edebug: =2EPHONY this breaks pkgbase: package production and distribution is broken since t= his commit seconds=3D$(($(date '+%s') - )); echo ">>> Install world completed in $se= conds seconds, ncpu: $(sysctl -n hw=2Encpu 2>/dev/null || nproc 2>/dev/null= || echo unknown), make -j64" = sh: arithmetic expression: expecting primary: "1720982146 - " best regards bapt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1A2FA96F-3AB4-4A8C-A64D-7C15C0AD49BB>