From nobody Mon Dec 29 03:28:06 2025 X-Original-To: dev-commits-src-all@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 4dfhWB70q0z6LbKZ for ; Mon, 29 Dec 2025 03:28:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfhWB5qQ2z3vDY for ; Mon, 29 Dec 2025 03:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sfrb49CbfL0EBNYWQLiniqwbkn3admbbnX1PIJrZV+c=; b=RLgJJE28SZ8BJJsC3g9qeeCV6/uZRwB0hb5Hyp4l854x2esGs5zFzuyTzfp1VXpZgzn4x4 irXUPGXL33C6wdaoEliyhR20FdasL2LQZICCkXyVYYiAjzX+D2A1EjRBLFggGy2XBueDSf Qm6Xce8d8ygVWHJqm3KlVnps32lx5oblNcqhfC1p2Tqytku+85kSNS2T9HegrvHIeq9cCh TwhIba6NweV3LGFvSV03Avg1IbP3xLbbhHUWvfjY5Xuhd+xHqhY7UHq5EA9BK4uqqpsQen Bw3H9PoZDtUrRpaX+fPoesGw8KeH/wz3oXUHhwAZrIFKDkjefE+5QjxFUbNp/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sfrb49CbfL0EBNYWQLiniqwbkn3admbbnX1PIJrZV+c=; b=NzLiGzBOhEnwBD6Vs+X42wmVbNOzVYCfRM049c2Ok4rZ0xbuApbLNTUZ7i0TgclBj14sW3 ldXVdNVnbr273TE2QAlgXWghtjNxd2ZqNVZlIBKyoj7AOMg8JN9Blx2YxpDXfMNwq0Zx25 VrarwkctvjH8KReX63dB5yFYdhyof4haiKPvKIbfQzKCW7nMElL8/iboCO1bKaXCXgOtAp uUrq5TrFyXdoWdkj1NgZhYy0GQOh87cDpvseyVvPUz0Sskatjw7+dgGfLRxzu74q9xaep9 ltUo8Pj3sH8HjKuI9f9PHP13HjuXKK2/bJZ21cT8lpFddaOxu5c3JD/ptvDPDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766978886; a=rsa-sha256; cv=none; b=XkxcDXvZCzsK0U50kZsM5P2t72nzxxpiAZmY7uGq006HDWFp0+BksISH1iLFOpP1AgkvgN FXCUet+gWKQBn+Z3iw88z7u1tMn6Muxv2JFavJPY1KodC4AF0C1f/U7GnzUinhYOYpY+I/ QvHGUPfOTJOjK9mP7sRzIdwTpvcP3piliG3Nmg+/KgfM+GrS/V7xboLlAzNDC7rENieCUF YmF1v7Seswv5Z/B2kUTMfv8K0aTcbMh3qWwinRd2cncw6mU4OcyXfTtn1CD72lJx6oKmIZ KaCnAoNyxrWLJCmlI4kHKpll/NUjksjKImATi0qBIei6YIWPaT1xVqNeBKMfIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfhWB5HsCz1CNp for ; Mon, 29 Dec 2025 03:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d218 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 03:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Colin Percival From: Xin LI Subject: git: 92d80c231d0a - stable/14 - GCE: Don't .error on unsupported targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 92d80c231d0a0f53daf6224037181d648b06b632 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 03:28:06 +0000 Message-Id: <6951f546.d218.17480e44@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=92d80c231d0a0f53daf6224037181d648b06b632 commit 92d80c231d0a0f53daf6224037181d648b06b632 Author: Colin Percival AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Xin LI 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)