git: 7b707e797b2c - main - Revert "release.sh: Add -jN to `make release`"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Jan 2024 05:44:01 UTC
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=7b707e797b2cd6265ba8f6215e59445e9efb9e97
commit 7b707e797b2cd6265ba8f6215e59445e9efb9e97
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-01-29 05:42:24 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-01-29 05:43:56 +0000
Revert "release.sh: Add -jN to `make release`"
The release-building code is not fully parallel-safe yet.
This reverts commit 9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47.
Reported by: jrtc27
---
release/release.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/release/release.sh b/release/release.sh
index 373d10d9a303..75278a12daa6 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}"