Date: Sun, 16 Nov 2025 03:12:04 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: 567ba10572cf - releng/15.0 - GCE: Don't .error on unsupported targets Message-ID: <202511160312.5AG3C4SC093996@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=567ba10572cf6c75dec6175c4deae3df68470921 commit 567ba10572cf6c75dec6175c4deae3df68470921 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2025-11-16 03:11:10 +0000 GCE: Don't .error on unsupported targets We ingest Makefile.gce even when we're not trying to create GCE images so we don't want to .error here. Instead, set GCE_ARCH to a dummy value which should make the problem clear to anyone who attempts to create GCE images on an unsupported architecture. Approved by: re (cperciva) Reported by: Jenkins Fixes: 0a8ecca4e315 ("GCE: Specify the architecture of images") (cherry picked from commit 787d09753f70bb382a7cbfba742a612fa54069e6) (cherry picked from commit 375f8df26be16b58ff9185823e5d90761d2144e3) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 21df4ddbc3f5..31770bfd5098 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -20,7 +20,7 @@ GCE_ARCH= X86_64 .elif ${TARGET_ARCH} == "aarch64" GCE_ARCH= ARM64 .else -.error "Unsupported TARGET_ARCH for GCE: ${TARGET_ARCH}. Must be amd64 or aarch64." +GCE_ARCH= UNSUPPORTED_IN_GCE .endif .if !defined(GCE_FAMILY) || empty(GCE_FAMILY)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511160312.5AG3C4SC093996>