From nobody Mon Jul 15 13:51:39 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 4WN3XC31psz5R08K; Mon, 15 Jul 2024 13:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN3XC2cLjz4qKP; Mon, 15 Jul 2024 13:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721051499; 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; bh=XAMbQtIHfWqglUEdANrlbL9gDXhkKsJuedgSObZmWJ4=; b=ddi3grJ2Vi04fSGr5tANssnOcAKewlDxGOWKATZtTYPzZHVeMp4pFU0NQQo1audTvPrmrG otIX0QN3TRWlq8xboInWAPVoqKhhePM1ht3Ozx9BrjZ+RnchNbpnIwiG3Jftz+RVqKw+3p YU3/GQAADce/IMJNo2qreflPkmGngz6XytiNpaDeLu8MhflGA15ENGNEJHJXPjlBEF4XK/ kbzgg2oeprMbXws4yhxXteBjcb6jynwDj9zSIvypDHFR3h/9FAfZHgw8QomJa5Gdr5IlzW grUFhUrlb0IaEWmBdWLZOfxHr0Wct84KFem2LWW4DSznH8ahauoV8624tWt75A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721051499; a=rsa-sha256; cv=none; b=aJJKjoV1qVv3KnXjl5N6PdIvUodIuxItDgQJVM+qY/R5mjkmPPEqy7upkM1R+afnI5eKJ7 Zj57YLakkAe+nGTgzo44oLZaQIk/lv5QyRxHwm/3N3Jmyx2NHTYWcyCiqXKSML8comcOkh VPR0ZUaHvLKPaefSST+7/7EXaPoiTE8d8pQSqbe3HNuLMLULOtAv9O7BdxuQEV7Qx5SxDQ I9w5kXIX0U7o0YpWX66az+9rgsJh3MK1lBA8oK8x0LO+oBIqFKHc07ptsuiMTu+3MHNMJq O94A/GMGdpiSox5vKazALDmwMUnHAMKhqv0mXcizgqvm9TMRngHKh3zxaOzZ4w== 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=1721051499; 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; bh=XAMbQtIHfWqglUEdANrlbL9gDXhkKsJuedgSObZmWJ4=; b=JhA69Ev4CWDBE7UB7C5eibCNXepu5z46Z4zgf01NunimGUzBgLXTkMXVtLfPMWilnNZyO9 ta/Fhs3oFFNGC/02JvuWm6TPZ9u7SuueLkK0rQY7AGUkK9b+UEYHez7OQASd5tPGia/NJH Y5hSxzLbuCGW5SfwOqHfmLIWeBOexU9bQHkjb2wi2dVCSjyEC0uzmpbTN40DC/wFh8NBwx w6Q/EjOfafwxoQHmr27UWpfoOj1pfqcXrut26Mw/vfjkerCPy+i+dcdVvrB1QCbThkr1dc y1RA0MiBTmGAl3zciGx8FFT/rbGEJorU7e+3b63udY1GsIAu/OXqdiFhQoXXHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WN3XC2Cv2zvXC; Mon, 15 Jul 2024 13:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46FDpdYF092824; Mon, 15 Jul 2024 13:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FDpdWE092821; Mon, 15 Jul 2024 13:51:39 GMT (envelope-from git) Date: Mon, 15 Jul 2024 13:51:39 GMT Message-Id: <202407151351.46FDpdWE092821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 867873b3980c - main - Revert "Makefile.inc1: show time for `make installworld'" 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: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 867873b3980c42c379f1f0e6ac88d92337ddf5dd Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=867873b3980c42c379f1f0e6ac88d92337ddf5dd commit 867873b3980c42c379f1f0e6ac88d92337ddf5dd Author: Ed Maste AuthorDate: 2024-07-15 13:49:26 +0000 Commit: Ed Maste 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