Date: Mon, 29 Dec 2025 03:28:06 +0000 From: Xin LI <delphij@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Colin Percival <cperciva@FreeBSD.org> Subject: git: 92d80c231d0a - stable/14 - GCE: Don't .error on unsupported targets Message-ID: <6951f546.d218.17480e44@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=92d80c231d0a0f53daf6224037181d648b06b632 commit 92d80c231d0a0f53daf6224037181d648b06b632 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2025-12-29 03:22:19 +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. Reported by: Jenkins Fixes: 0a8ecca4e315 ("GCE: Specify the architecture of images") (cherry picked from commit 787d09753f70bb382a7cbfba742a612fa54069e6) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 31bed380f56e..e492aef11ba2 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -22,7 +22,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?6951f546.d218.17480e44>