From nobody Wed Apr 17 05:43:54 2024 X-Original-To: dev-commits-src-all@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 4VK8wW33jbz5Hv78; Wed, 17 Apr 2024 05:43:55 +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 4VK8wW0J9nz4l4h; Wed, 17 Apr 2024 05:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332635; 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=HdDGOmOs/GWryLtQ0OK4vEEfZTOORCkRebA0kyIEVEI=; b=mtG07zMA5R93rSrURfFDL+enad1a3WJTWpXrz8ASLZ/5ogD1tqs3qhq7EcyUngPdH7UORt wlYMSukezOgP0pmQHLmrS+TiaMI3nLWW77cvh9MJlZwcNtN8DbmvEnLugf/XJUwqDz4Q9X 28+A6QWJSMSDrPW6U9AysZzY3BVGbInylxcYGdB1Izkn3A/d0IdPcoR1q7c0Kzzt44ErPW 1kpy69Q/3R3gO2GZ5kImxdAfXgkGda1MW2ArlvjSVcDwlJEt+XzNnW3gE4PhF2G1UXd0Lv a1OoEnMofXh5wX6WrS9yr6hlEtV/1Iif4cCht9qGt2lc0tp0xn26LMAh1dXxTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332635; a=rsa-sha256; cv=none; b=VXc6kClIiT114ynLhGr2mXJFxEpcuLrExZdgQ/aU/3v5mpEUCwaz2AdICy6RrlNvq+0cos LKd99sRdmLt7p5g9AgZ5++JXkOFKt8pZpYovhi5W1VpSim0HX87kDRJ8MzfzWYoTi+69xx 15W16Q3CbJSGqLzWd2VGBWk7p6y0KXQT5Wr9Cz467FbAU5OeRxphzvDsMQp1pzO0S8MCE7 0LKta40BYqXQgH407AhS68e2LYwbACXo9ef2sw+jBUEnQPOU5kqU4u8RsKUfDAMxy7Tkla raj8QrZuXC+NeT6mSx0qgkK5VHanZNgYkwFClmLmPmdLpaRywq2BeArQn10NjA== 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=1713332635; 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=HdDGOmOs/GWryLtQ0OK4vEEfZTOORCkRebA0kyIEVEI=; b=nnRAZtT2zBjRVGx/wHzrRqwiHfW0LjwwFy3+uojP2GUWMcgQhiBiDxULQY17tB7ZeoUPiS eoQ/gy95b1Vw+QhIY3rFAfVqeJ2ipy4v4VDNySoly/xZB6CmjsECGlRH+35OxsLPxnkF7N QkoaJ01uWxINYeAcghaPkKmjBqVwPw+6Cs5GtJS1YjzQpvjeyRHIzDn9s3fxFvKRuxlZRz cwVqX/G+jZxaEsoyezlqdZEBpQlIWcTsRAVy5tzn0FMsNGTOVxJJuAMjMxru/I0lAf05LP G+IMlnM1NXuwzhKxEcLt6b1nix7c1lxQIW2BYNUWgltc/mfjbUOZaQ3SedOQjQ== 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 4VK8wV6yRzzFBs; Wed, 17 Apr 2024 05:43:54 +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 43H5hs80006714; Wed, 17 Apr 2024 05:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5hsJ3006711; Wed, 17 Apr 2024 05:43:54 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:54 GMT Message-Id: <202404170543.43H5hsJ3006711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: db34bbcedbf5 - stable/14 - Reapply "release.sh: Add -jN to `make release`" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: db34bbcedbf5b9fe7c015856cd04136923e1ce06 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=db34bbcedbf5b9fe7c015856cd04136923e1ce06 commit db34bbcedbf5b9fe7c015856cd04136923e1ce06 Author: Colin Percival AuthorDate: 2024-04-10 03:27:44 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:26 +0000 Reapply "release.sh: Add -jN to `make release`" With the latest changes to release/Makefile, it is now possible to run `make release -jN` without the build failing (at least in my latest tests). This reverts commit 7b707e797b2cd6265ba8f6215e59445e9efb9e97. MFC after: 1 week (cherry picked from commit 2c01e189ff190cf1618dedd01f196bca68298c44) --- release/release.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/release.sh b/release/release.sh index c9d0203debd4..3c68f89c2cc3 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}"