From nobody Fri May 17 18:46:43 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 4Vgwsw205Jz5LcJK; Fri, 17 May 2024 18:46:44 +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 4Vgwsw16s8z4p97; Fri, 17 May 2024 18:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715971604; 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=qF32+mnx1lb28jOnAiwcE18b7uoRoqskwytWsMMUTEo=; b=Sbi614RY5II3ak3y65/sq2/0wqQ4e5dc+NAjAg1yyDb6Uog0WoQqV0kmAoneE/UZLR2PIY zzC5yh055s/ERgc9+KrJ8Moa5ZsHegVfSyEnrImWrig9WBQjwEgeIUyFc2T71e2a8T8Olw R2dW66OBayZyPne/rR4T8v8f+zbxk4B8U+YvBvm9Xti3pwIeZZan5xi4Ef8AvxrO2F6S0h qhnGC/Hu+pynKZnOHFSbRa8Oc5TdC9Su1wRWDVZpm5VwEXp7P3rK+vEiVo93euxx2g2aZi IR5w6YfjWZSA0l4a5abSEsE7ZE8fmyD6nv1wcfMDyHspYB+gBM67lKZi+x8R+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715971604; a=rsa-sha256; cv=none; b=mph3W+i0VZUYhqv2WoCs7cHEQgzHHGJ8K/gx0EsCLiBlRC9HIEGaBFHry7mhTA0HnEtuIS 801hxoA9ghLK85Gv2LqeW7ruwOTSYZru/cKmo0Y+10v5Ky/p6oDDqJ0MWsAm6HMeozWaiK aOGrXUb5Vp8HfHzxBRkyNLftzRWR+eo4f1fwbtge3n470CT7aVQCvlA4qenZuSz84KnL7E /54yG/dXMiECDQZ7YWfJy6huVM0sbCs5cKbMGpuvHeiGjyuzvqg3lRoZxz2O12HoMXkt0B LFYClKkbvtOdgVjyQLJLpEOIuCNnhVv31RBgoiX4BeodaM80qz/2uSdJ92EbvA== 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=1715971604; 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=qF32+mnx1lb28jOnAiwcE18b7uoRoqskwytWsMMUTEo=; b=b3TDPD1D0XB0egpU7a6bMvwxpTANMxvcDcEISilPts3cit0Kvk5TozwoGgKQNLY1IPJ3Jx BJZkfrFvNjL6UsrfJkRprWqXWbyoEPv8uv0q6guQKxd43fAI8ssLsyU3GFYbtCR1XhiYS0 zCflkIiavX4fNlGJ2YqclujcVDN7ZRshd+nIeIOohSHI5a4g7FzPlt/TNPGidHqngSmFbC L/ehKZLc97hqy/S/KLHtk1W7gR5YrkYhlRshPcnCz4ENT8dljmV3kIZGreuVxCuUryaa8+ cQtdQ/vJHQZ2RUHB9hrCI4j+AnHJv1Gsm/aWwz3GBA+ECa8F8ZefsTNp6Q/Acw== 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 4Vgwsw0k0Fztbw; Fri, 17 May 2024 18:46:44 +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 44HIkhII019023; Fri, 17 May 2024 18:46:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HIkhwE019021; Fri, 17 May 2024 18:46:43 GMT (envelope-from git) Date: Fri, 17 May 2024 18:46:43 GMT Message-Id: <202405171846.44HIkhwE019021@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: 1f2c98c92c65 - releng/14.1 - Revert "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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 1f2c98c92c655c28d2343e049ce33f6b8ca28aec Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2c98c92c655c28d2343e049ce33f6b8ca28aec commit 1f2c98c92c655c28d2343e049ce33f6b8ca28aec Author: Colin Percival AuthorDate: 2024-05-17 15:22:30 +0000 Commit: Colin Percival CommitDate: 2024-05-17 16:15:33 +0000 Revert "Reapply "release.sh: Add -jN to `make release`"" Release builds on 14.x have been failing for unclear reasons; the most likely culprit is the recently-enabled parallel release building. Turn it off on the 14.1 release branch to make sure we don't run into any problems with building the release. This is a direct commit to releng/14.1 -- I'm leaving parallel release building turned on in stable/14 so I can try to track down the problems there (and it's also enabled in HEAD, where I haven't seen any failures). This reverts commit db34bbcedbf5b9fe7c015856cd04136923e1ce06. Discussed with: karels Approved by: re (cperciva) --- release/release.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/release/release.sh b/release/release.sh index 3c68f89c2cc3..c9d0203debd4 100755 --- a/release/release.sh +++ b/release/release.sh @@ -89,11 +89,9 @@ 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 - # and 'make release'. + # for buildworld, and half of number of CPUs available for buildkernel. 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" @@ -192,7 +190,7 @@ env_check() { ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \ KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" - RELEASE_RMAKEFLAGS="${ARCH_FLAGS} ${RELEASE_FLAGS} \ + RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"