From nobody Sun Nov 16 03:12:04 2025 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 4d8GBY0Xthz6Gpww; Sun, 16 Nov 2025 03:12:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8GBX1gWDz3n96; Sun, 16 Nov 2025 03:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262724; 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=ouhudHsua8QPqsUp5X8Ki1C0WxztE23KUfdlBR7pQZ4=; b=PuVFwlD50M1/iG1Si9n4c3lB1xkXu4wOFKi4P2FSTrIeT+D55SGdFjZNF8YNYrU/rj7U/M FHLvuFJv9u0InvUScd/nRRCOu/G5r1NinzWSHUALbhnyBSJ6Vqhoqo8Jps82QYstgALKks mwYswlQ/xa2I10jeiW2O9sj7PSf0iQx1UPRUW/zewF4uMEn5vt9LN20rkYm64gHwBBzCDV x8gJBGDn4WexcB94TetHH0bdFNtX6OEPFvq1CZ5y7pcqyEovNfbjEeanurnVoZR183yRaa RPL1NyhgjKYBVAGzUiNkGzGEhdD8XfRZlc7yqwhZmVXzBgzWIFnuEZ4HPgVC0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262724; 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=ouhudHsua8QPqsUp5X8Ki1C0WxztE23KUfdlBR7pQZ4=; b=IGWjLXtr+Uc+jifNTZJJgGbvmY6AghEZVpFY2FiyGknnsilAR/KHCBQhNSds8yVUbd39Ws GUoqIc62T00tTdrZHyd35UkFc9k2CtYfZAkams+g4A1Ws3PBAfoq3ooDiRanJO2dGlMXnk baV0iigIt9p443s+BgB3gAVCi9I3NRaH8/TdR5mKuRSnKGRX6bEnjP6qjYLA3DH3TkwK0z 4jtJz/1IKKDXTrIT6MOnZCnFu//xbXz2pYQa+VGVZK5ilOCjmP6KFZlLMJqy1s/0+hv7+L PSsdAw1MyRQYAXX8+KsWPiRx5z26yHDknX5ZGbVy0oV2dGgt6ffo/0jg4AmvkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262724; a=rsa-sha256; cv=none; b=nsWGqKr/o5MY+U7uyNfhuF0b9PVOLvpc8Q4nNLcEubxZtxyEa2h9Rza86cl8byNvJF+rsT ZdxAATHXNcdhcvWidwOykibO2NSXHBQkPlkC9gbfK9LB0JgGhkdvyCRk9WyZOJ2bFQeBJx bTEfIctrd9vimU2VnZT+5R8WmoB4H+5HndDWuLhLyZ2Z1MXv7WaIZyFkTaXdiiBYcyDnjW CtwW8M09gSj+RXU/Kv6Vt+WjyBatY+X9dSqSva/0PSOXyz7UgaQnZ+YGXE693DwRZOEaBo id+9F2wleE7JTdvjVysXxliQxXNkQZjrTgGMyDhuXH8lu+OPE1wjjJcW3uHWOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d8GBX0xS2z5bR; Sun, 16 Nov 2025 03:12:04 +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 5AG3C4ZK094011; Sun, 16 Nov 2025 03:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C4SC093996; Sun, 16 Nov 2025 03:12:04 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:04 GMT Message-Id: <202511160312.5AG3C4SC093996@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: 567ba10572cf - releng/15.0 - GCE: Don't .error on unsupported targets 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 567ba10572cf6c75dec6175c4deae3df68470921 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=567ba10572cf6c75dec6175c4deae3df68470921 commit 567ba10572cf6c75dec6175c4deae3df68470921 Author: Colin Percival AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Colin Percival 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)