From nobody Mon Jan 29 02:08:31 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 4TNWtR45nMz57q97; Mon, 29 Jan 2024 02:08:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNWtR3btrz44mM; Mon, 29 Jan 2024 02:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706494111; 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=6lVzaEgDceAJ6WZucnu29heKuowRVLVYtZRpFOGy428=; b=DaxP5vfpt8SrarYt8yZ7kw7r/Cz7QxJghSvJ/A0lcM/82RxAYT/BNDYbncjmb0ePwcWThX p/Xt1TyWfc/xfa7lHvLswF9n1aui9wT0xnk47T4hmb8buO8RBccrhNY747zgXInX5YzzTD wgDSY5f1kTElS1ZBSRP0HVpQ2rOK+GACAYdP6+F7EeLQZ+lUvGy+rNoFeDRzRMcQ7wgT5n 6qj2EYlezRf6zBvrcHO/CkD9UJ//GaTXddYJi+xvcl5Xo3EVC6l/s2JUhQ0tOfl2EHdT6L b3NYQZS/sNlAr0FbAEnf2jUCzTAcuyFZyXPlPiEzOiuLDwBxqmH1HorBtCRyMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706494111; 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=6lVzaEgDceAJ6WZucnu29heKuowRVLVYtZRpFOGy428=; b=frSGC4e+IfPIpigHEOmZmy7TrIZM7mOiWKw2h0kCgvAFPVvSj9a5Bw46yghDjlPljWAPrQ LhVxI52LLJHe5qddT2wcYjUIBmewcwsqwIbwMtAbYQRWf3W8kiKrEny2uIoam699xPta80 GEIaWSmDNOMbLt9rpT2O+J+zFyi79AucjhPz8QTOH+yBlwv/OgeVqx2dWIBJq9lQA1gHBd qjN12beNHF5BO891Cuuj0LQ18p8CHuidwb1m5HC6gAtt8VeRfPLxYXQakNYgIbhSnih3Sh 1BPEjf9TkQD0nRc5TJARCOGYvHWbKOCXv7lq6WOD5U9pLozY/S1gVWH9xvreoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706494111; a=rsa-sha256; cv=none; b=PEAnzMJSlnCUxIlKaKbqkNZ3lcSSvGYsvs0aTO39AkkA2TtlfhxmMd2Z6AW/JBkBf2qTlM GSW7YaHtL/XWtXs5rbnAeTmPuS3ntl2Df1hyuuwGz32VnKNT1PkokyRvVA7rVMnHQWNmuM xjN/hQVPMZGdDw9/YFUyL7ZJ2N/gPk0Zg3IkQKNTRNV5Z+1cC6sUppc/qEq2VbL48aMENW NM7xn6fS1xhi3lYS7mXRjZkspjzEr5ZEOq0p89tTMpknUqNHVGsfxDaqRuhwG5bWGVrDaW 8WBBtbh3ePOXjWPfmfVut/d3NXFUY+rwZDTsRTO/fmlNt5fBsZmX4uaCx9t0+Q== 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 4TNWtR2gFVzYTr; Mon, 29 Jan 2024 02:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40T28VLW040362; Mon, 29 Jan 2024 02:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T28Va4040359; Mon, 29 Jan 2024 02:08:31 GMT (envelope-from git) Date: Mon, 29 Jan 2024 02:08:31 GMT Message-Id: <202401290208.40T28Va4040359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 9c1bad2da5ae - main - release.sh: Add -jN to `make release` 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47 commit 9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47 Author: Colin Percival AuthorDate: 2024-01-29 02:04:20 +0000 Commit: Colin Percival CommitDate: 2024-01-29 02:08:23 +0000 release.sh: Add -jN to `make release` The `make release` command now creates VM and cloudware images (if enabled) in addition to disk images; this results in a very large number of 'make installworld' commands running sequentially. Adding -jN should speed this up significantly. MFC after: 1 month X-MFC-to: stable/14 --- release/release.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/release.sh b/release/release.sh index 75278a12daa6..373d10d9a303 100755 --- a/release/release.sh +++ b/release/release.sh @@ -89,9 +89,11 @@ env_setup() { SRC_CONF="/dev/null" # The number of make(1) jobs, defaults to the number of CPUs available - # for buildworld, and half of number of CPUs available for buildkernel. + # for buildworld, and half of number of CPUs available for buildkernel + # and 'make release'. WORLD_FLAGS="-j$(sysctl -n hw.ncpu)" KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" + RELEASE_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" MAKE_FLAGS="-s" @@ -190,7 +192,7 @@ env_check() { ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \ KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" - RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \ + RELEASE_RMAKEFLAGS="${ARCH_FLAGS} ${RELEASE_FLAGS} \ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"