From nobody Tue Jul 9 18:11:55 2024 X-Original-To: dev-commits-src-branches@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 4WJTbH4ytlz5QqkM; Tue, 09 Jul 2024 18:11:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJTbH4WLxz4h2D; Tue, 9 Jul 2024 18:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720548715; 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=/kc9+a4K1I1sDyJT9SpD9JHJfZOOUc9mYi0Se6rY57A=; b=JI3grpE04GjNNp+e0+Q7aj5/Z7mrhSsTrjSHHqGdQ+ldkQWEkZYeOmSdNjc6U9mn97EG9m JWPitEJOofEYy0SxgLZXUddjPr6Xq2/g2WCu2Zu5+jMz/d2vX74lbyCZ0TZZtp6sF+vt/8 f3e1AsnWJVNEBWxYtMbB3NwbIIu+d10ORfy+B2/jROQUWCj9HB0T+eIZgQ4bhK/zH5F2J0 Dp9tMtmnsIfm4W6p1mJVEF3BbcEtD70C+rgq0OhPJUNiQu/pHnm2r4AV/Wi/HNQ92hFBpJ KTdVOMJc+1tixB5wZV5XKLN+BaQGSJBR1TjwJTmQt/cpj3nrG4QCHM8OFzWNiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720548715; a=rsa-sha256; cv=none; b=ehin3XFzqdfI3vNA4AXdLPQ1Kwq9F+pnMh6v9gukdhEMSVDog3ODEPIGbzoiskJN4EVqLW Dp8r5v40Tubgj0itViHlmXE8poKSCFI1aLfNFiGOip1KSzVmrsNSZ5XG8+QWB185DzXtKS aVWpJrtfu2V9hfylWk1ox16v4+pTyEB04ZmyTs/+jS7Udb3s/KrTXlmAjAeSI+QyZWEGsm YmGcYbFGkJaSU5UcJB0H8LA8c6xzist9d6z6sl88bQfJdzbQW1/FnNHVJoRaT4tq6zzwzT NlEB9PMSYoc1Hy5As+Pw1sbwPEAdill2o8e5eywDM3FqGAKDTzix2AyVcf4LCw== 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=1720548715; 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=/kc9+a4K1I1sDyJT9SpD9JHJfZOOUc9mYi0Se6rY57A=; b=i5CQII7vOq49O8fanjoJ+W4i9HEqdT8XKmlCg2zGpX2maSZLiB0caA1LgPVAcBtQxN8JSb UkHnH9ryVhmByiDdFY3Z1g2e0X+V6zdmx5I/s03LJGaHki5sarzkRmfPrzmUX1rZx0t1Kv riV+Xn08ud2gHUrAppjwweL3kkoppV1uOVu6zb5R+jPv0uoXm6qIY32nh4B5fKEJUKUasV /M7v6XsToVM5I4VxUvLtFcvdOHV8mX0VrdIrrjomkmNjhqsm5I938Q2+Nbgq0wkTflSSlq aqnEdCuWSy/HpHMTaE2Q71Owjy/I4hy7JMzVCiRAWI9VIwHLofnboIXLJiX3cw== 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 4WJTbH46mfzlG5; Tue, 9 Jul 2024 18:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 469IBtFL035437; Tue, 9 Jul 2024 18:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 469IBt88035434; Tue, 9 Jul 2024 18:11:55 GMT (envelope-from git) Date: Tue, 9 Jul 2024 18:11:55 GMT Message-Id: <202407091811.469IBt88035434@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: 410c50ae477a - stable/14 - release.sh: Pass ARCH_FLAGS when setting VMSIZE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 410c50ae477a61d88422a72fd2b44b770627bd89 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=410c50ae477a61d88422a72fd2b44b770627bd89 commit 410c50ae477a61d88422a72fd2b44b770627bd89 Author: Colin Percival AuthorDate: 2024-07-06 17:15:22 +0000 Commit: Colin Percival CommitDate: 2024-07-09 17:50:14 +0000 release.sh: Pass ARCH_FLAGS when setting VMSIZE [MFC note: This is not needed on stable/14 right now since the riscv64 images still fit within the default 5 GB size, but I want it in the tree in case I need to bump VM sizes on a per-arch basis later.] The default VM size may depend on the architecture. In particular, it is currently larged on riscv64 due to a toolchain issue which results in bloated binaries. MFC after: 3 days Fixes: 59c21ed6e811 "release: Bump default VM size for riscv64 to 6 GB" Sponsored by: Amazon (cherry picked from commit ed807f7bcaecbf32b0b81a7d18cee489a3666157) --- release/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/release.sh b/release/release.sh index 3c68f89c2cc3..cee0fbd5643d 100755 --- a/release/release.sh +++ b/release/release.sh @@ -337,7 +337,7 @@ chroot_build_release() { fi if [ -z "${VMSIZE}" ]; then VMSIZE="$(eval chroot ${CHROOTDIR} \ - make -C /usr/src/release -V VMSIZE)" + make -C /usr/src/release ${ARCH_FLAGS} -V VMSIZE)" fi RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} \ VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE}"