git: 1f2c98c92c65 - releng/14.1 - Revert "Reapply "release.sh: Add -jN to `make release`""

The branch releng/14.1 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=1f2c98c92c655c28d2343e049ce33f6b8ca28aec

commit 1f2c98c92c655c28d2343e049ce33f6b8ca28aec
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-05-17 15:22:30 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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}"