From nobody Sun Jul 14 19:12:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WMZj30j2bz5RD76; Sun, 14 Jul 2024 19:12:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMZj3052Tz4hMy; Sun, 14 Jul 2024 19:12:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720984359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U/j+Hq59qw/UXi9N6mD0K+dqBQHYtKW8bEIkLggKfnY=; b=UyRezk+SSlLQg+afjNfEls7fuCb0rQ2CWU2b0T9QPCwLIgnEWb4D+b5TnXFFnZXnH5VGdc dCP2BViNqVc2IDE9K0BBh7LZJMtbC/0ZVKZKW0eEFf9V2ZhMhKrXTXfuxTOt6zLyLP7CvY xMEUfB3ji7C2NMUUXLBGf842rmWaQQIaYM0EmTekg7zLIxk2j4eYgdfU+tqXcgEHcxFelP R1Zxf00H+c4tKl0lPvcbBnPAHpBaaUe1hZUzr4RGC3c9wymJirYHcRH4NOoujQ8HM9ceil m42zcXqmymK9Q7TEh0NE+qp40tdOy2TqcPk8JlVy/gGBCL5tsoApKG3UQ4K9bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720984359; a=rsa-sha256; cv=none; b=IhssfivMJi4/Q+rgIJeWmLFJjPkTMitC9eycL3lsMgnPagi9P2BLY6eTN2w97UoS83yZZi mpG963ImISdPHmOGRqbmUWl4xfgiopCCQmP3647bedtDs1SLDTNfb4ckkByQOWmBmr3Cme uJWCmhNxGo5Gkpch596FJla0Gkry8AeRs5Amh+zjsowODLf6rtd+RfKmnqt09PhW2oX19H u7HRypDYEJ62qk7gd1mTOLVaa4WHe0FtNBSeFVet95Dm0/PQVIf3f7VfAkP+aE5GGdjGWi 1u/3PpA/14NXeRwd/biBhbZJFmPWSeNix8sYCsb21TCkdQ1S1gQHu9CsmLL89Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720984359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U/j+Hq59qw/UXi9N6mD0K+dqBQHYtKW8bEIkLggKfnY=; b=vCHwaUz8MRUfe1dIfVyCgGvzpfm81uH3oP9oAckD5AoMWSUNR1R+PPYPcBcjppVhksnv/W OyrSErv1igc7Cu4HDf0iLCtPUAMb/qiAQEkNL6ysWnj0G0v5osfsxCBEblvGyVjEk90bny L+EcQMe2NIDTcA2dKRKU7xYglom+c2ziVcl0NSVHlLUtgGAfLz4aN+BQsEwNPOfjt4dk+V iXBqYjK7e0DSGnTeocqmyBI3CifTf2ED6jXOKUVhCSATFldpyUpBRFFtJKdLkbQ7bTDdjZ ZBjgX+BDt83nv26Da2lsil0Wi3BfINk4knzEb98Vyl9eQzKT+uRW+SMpKlcPsw== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4WMZj25gCPzhGJ; Sun, 14 Jul 2024 19:12:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [127.0.0.1] (unknown [78.152.223.113]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id D6FFB14E98B; Sun, 14 Jul 2024 21:12:35 +0200 (CEST) Date: Sun, 14 Jul 2024 20:12:37 +0100 From: Baptiste Daroussin To: Wolfram Schneider , 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?= User-Agent: K-9 Mail for Android In-Reply-To: <202407131039.46DAdpeF060632@gitrepo.freebsd.org> References: <202407131039.46DAdpeF060632@gitrepo.freebsd.org> Message-ID: <1A2FA96F-3AB4-4A8C-A64D-7C15C0AD49BB@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 13 juillet 2024 11:39:51 GMT+01:00, Wolfram Schneider 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 >AuthorDate: 2024-07-13 10:37:14 +0000 >Commit: Wolfram Schneider >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