Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jul 2024 18:11:55 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 410c50ae477a - stable/14 - release.sh: Pass ARCH_FLAGS when setting VMSIZE
Message-ID:  <202407091811.469IBt88035434@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=410c50ae477a61d88422a72fd2b44b770627bd89

commit 410c50ae477a61d88422a72fd2b44b770627bd89
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-07-06 17:15:22 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
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}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407091811.469IBt88035434>