From nobody Wed Apr 10 03:29:23 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 4VDpGX34gbz5GfYs; Wed, 10 Apr 2024 03:29:24 +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 4VDpGX0D1Zz4Psw; Wed, 10 Apr 2024 03:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712719764; 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=GMD7cz/3zcKXYAygEpKIp4+QKzyaPL755KjoPvDpIys=; b=gklYfrr5hdIjpxCDgc8xtj5g/gUU06YxqOzDN2dIMOPR1jCODUMbod8ePNPDIGlzg6KnVZ S99y9pYrp0daOE1+79IXw5y1x0WsqaBGmbM8PfCkQDuwqsUT621lUgIUDBTMFqprVXoy1V LZ9GLrQC0Tix3UiPSU8UL9S7UYUC8XfNHtXOVcjiSC2Zl9bviuL1/+iq3RpPCa5yocU2ua 6xPHs4eZW8B33VHrzzxcGX7l3R47jBK3uk/rpSAujkNwRTHbMp6VRAaxOxXS27IJ43c1It eIgkixWWANLQU1pQHXOAFm5to3w7QJ02Hn9mxX2cAv9e4868wjT7hmL3/kZNuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712719764; a=rsa-sha256; cv=none; b=w3TbE+fTdt8spJAzGFvuBqse0xhHHpJO2ADWLAbwR1olHzV53EPiD3JFhgl4acGfkup0oj lMRkx1euvfbgnvD1nAPZHmes6GdK+Y4iWDgShePrd6j9e+7lpV+jhWvD2GOObRwLk/KTf3 W/5pf8NqcVuZNWovcofWvnnuzPY0z2OfEvYO9A6UOOpg9Hvv1zy/gPmV7cLgHl/jo16LFP RGATns5WZ329nkzvjdOpSSrFOjOki7GeDkN0OZidu5mmzsf73XwOVJSr+XxA24mxq3sATG rdYlvATpRveb6LlfJ99h5h+zgfqYQ2g9XDfv5KpiTKQhuMpZCqvcpdJfXd3Dig== 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=1712719764; 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=GMD7cz/3zcKXYAygEpKIp4+QKzyaPL755KjoPvDpIys=; b=QnT6ZZyueCw35qaQ0TBb5ffL2dGHuPTT/Q+Xw3o4PPiAIZZuvTLrcLiJTvHart6Gq2+btz DPF9L96yAcLL3NpS291HvQGcOajJ3TV5bPRMMCTlwB+OmQgz4AzZr/dv+qsqkeOJJFycdw CnWOXZfeAOgyJMzC+g4YvSQ0eJQRHjesSw0SFVsbfLaYUyg/YmtgRXCwz+ufIyjPzZV4kQ 98TAh2lvmLy+NHOam/PHZj1YXRN3suaHeN9JUeQn01a/6HS159pclcuUNepxNIP4W+k5Sq xUKk3n9OolRzNr5W7lmS7MBOuqH8jqU0NWqjNF+Zu/dQqUSRslAilA+PbKpsVQ== 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 4VDpGW6NnLzLgH; Wed, 10 Apr 2024 03:29:23 +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 43A3TNXM089738; Wed, 10 Apr 2024 03:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43A3TNgd089735; Wed, 10 Apr 2024 03:29:23 GMT (envelope-from git) Date: Wed, 10 Apr 2024 03:29:23 GMT Message-Id: <202404100329.43A3TNgd089735@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: 2c01e189ff19 - main - Reapply "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: dev-commits-src-main+owner@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: 2c01e189ff190cf1618dedd01f196bca68298c44 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2c01e189ff190cf1618dedd01f196bca68298c44 commit 2c01e189ff190cf1618dedd01f196bca68298c44 Author: Colin Percival AuthorDate: 2024-04-10 03:27:44 +0000 Commit: Colin Percival CommitDate: 2024-04-10 03:29:16 +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 --- 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}"