From nobody Mon Jan 29 05:44:01 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 4TNcg53zltz58D6F; Mon, 29 Jan 2024 05:44:01 +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 4TNcg52xj3z4Qx7; Mon, 29 Jan 2024 05:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706507041; 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=jrnTPm9QB20GMrYAzzvRSznjAvHA3RwZp0ze2bgDskU=; b=U7zeQUxES/T6MzsbT/6FI0nGqajn0P858ex4LGPzfBjYu4xf3nEnv6+iOrmPGYo963IUD7 mKyREb/YStzaD2Rndci5Ve3P8pTve3hvSZCo7Etu99TgfySs+KiEQQFF+qLnecbvtlUWXk GPmTgX4dMmekvIWKVEm4ea9UIMPAvkGXKB0u66nTQOsWD8ijbdsSVWGOM2rhRce+HWWb7p Kfv606KoASMH3PWhWPwv5Ej9nRMP3KfD8T5sfKCGzxnAokW4WK4tT6ljk+/TPQSowybJWR DrNw17i4++YCR8suP/ey4ZbtPL+THnvx7LohUTtkRdzVlIRI7yFSIIxZuUnj2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706507041; 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=jrnTPm9QB20GMrYAzzvRSznjAvHA3RwZp0ze2bgDskU=; b=vP9l3C/7w/MQjwgto/BZUqMHPtryCHk5VWkZWh14UKa1ltF7Zr9qIaLQLgf0KBnDr2YQ7b K5DTXg8ZMy+LhRz1/wG2Vzbrh1p/xWT4yulZZVQhphInXOwIklc6Iy/LAlHxmhcrlk/qqy gRqaeCPOPk0UPe7LaKdpFv2s45KhnI9/yr7RAmxA89yzuthcA9FQlTQ7PP0+xdu8N5uJ6Z qW79ApW2Z6Jwg2RP8oPcLNwBxK0CiOgEXfRAqkJrXyXZjmJJXlwAtKxKVV1/KeXY4Rr1a5 TKWXX8mnIxqNyNyJYqnMyA2twPfLlcSmgOvCTeGWy4lLnY1P3a2hF6q9X5XrJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706507041; a=rsa-sha256; cv=none; b=RcoheTMXcKzCX6AxMmTAIf/+HIwrzXW0s+MxYozojAD4YYJKORgqTIxFM/GO8PZBddB/GY RJ8NmMAT/YNK7RkZHUgEijnpGA5GLc7xerF16lYZ+NB59X4n06c6tJo9j2FEKPK00R5A1r DsXao8cX8l4e3No/e4s6Oup12knM3BnvXoNVjFxQADM1TewlH61dnuawH1xOPQeENHsciJ BrTdBwr+7Ms+n2U/z/DI4KLPacZzw2RPdUOVHq/mMDAjo3IAY+L+mfluzBFFdFeGh4MQ0G EW63BvqT+WzRkaqOb4ltSQbCpbbtf7AxX5uiL2BuHtjJVi2lCJwfmLVC8fkTOw== 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 4TNcg522JMzfwr; Mon, 29 Jan 2024 05:44:01 +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 40T5i1iA011637; Mon, 29 Jan 2024 05:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T5i15M011635; Mon, 29 Jan 2024 05:44:01 GMT (envelope-from git) Date: Mon, 29 Jan 2024 05:44:01 GMT Message-Id: <202401290544.40T5i15M011635@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: 7b707e797b2c - main - Revert "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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 7b707e797b2cd6265ba8f6215e59445e9efb9e97 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b707e797b2cd6265ba8f6215e59445e9efb9e97 commit 7b707e797b2cd6265ba8f6215e59445e9efb9e97 Author: Colin Percival AuthorDate: 2024-01-29 05:42:24 +0000 Commit: Colin Percival 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}"