From nobody Sun Nov 16 02:04:33 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 4d8Dhf4ShMz6GjTP; Sun, 16 Nov 2025 02:04:34 +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 4d8Dhd6Rsrz3cLX; Sun, 16 Nov 2025 02:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258673; 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=gI7aHICn1morpLbQES+U+mstoR8oqzvKx6H2SMqtess=; b=VY2MnsH10d5f82wWbiq3WNSAWZ/T5YCLar4Ko6W8orwvhQw5tSF3pSEBOU4Ff8xDBgFya7 JaUnZ4/mROPoprBYYFb7+N+N9svHqSTYvpsOGoXkowpEgMXeUBNOgfE+bF5Ny5iM4aA7OT +DdLBPXtQrqMP/KGSMLdQ6gsvZ1AhBR/kMHIxu3jBfK1qYuRIMJ+9J+HjxadzXkwBvX6sw FgWXLKhLaHts4W2v7PTIfnkRxZpKG3yvzVKSi5c0O2BiFk0WT4+UgDv+brw6ZvFGta6kqm QgAGooWmeNXP/wPsagIz4lNyz2rQ1vPmj+dxeDjGlBi2rJRSJnQkhlLM8tXheA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258673; 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=gI7aHICn1morpLbQES+U+mstoR8oqzvKx6H2SMqtess=; b=DeQb3ZCTlkKnnywOdIzeJ0nA0bgn4unxU1U7tN0aRVGi4e2VjOpHUl6GeRX6OyxZMWZw9y wHMC3NMxCt5Yp+isVXo+Qf5KzKuGyOrWHBmi2A4yUg6C9v/1EO/wgPdVXVRKY6c3C6rEOs QKIYoU5dNI+hEAxDtd4IqZMk359gOwIV8p85dnQsXfIQuRX2fyKaRQF750nYWnX/LZFK4S 4p3cCId2mnUJLPguAJnnVSwytquD2jTFlQTTDpEPt2U10Vo/kAyrbu8hPQIV+KZdwVYn3S YvX4jDp7PQ/HOBQjJca4ESYM8u1z0GxiIry9C0s4VnynaQX29Xp9tcvbb9jxsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258673; a=rsa-sha256; cv=none; b=F8iTOCMTSUXaYkxX+AYQf6+obeaOktCp2YH2w9HdSP6Q8DLCRi0w89ncfrlPhjAigNSLOJ yI4L2IIXt1XqC1zthNLhLcQytOEVnGB7yR993WhKYGKTLVofow3vfTRIV87Vlm0O2XkuqU KBxe7xl9AadkxnqLbARs2JIC8k8cQJOXQ6LzV/CTvo8vezSzxqjRu3c1kADhulGIlnO08Y +++4vGuyHCppl+girMSDXlDMyUB1q3iwaqYV3nd+S465knlhe4aJY4lOSwhTW2eW0tj6gm xvYuDrAXgIJEiWZbhJ799CjpP8hBKcxjeANyPWiBrYGDJyLI6b3V6ANwwDOxNg== 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 4d8Dhd5mqWz3Zx; Sun, 16 Nov 2025 02:04:33 +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 5AG24X4J060983; Sun, 16 Nov 2025 02:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24XGE060980; Sun, 16 Nov 2025 02:04:33 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:33 GMT Message-Id: <202511160204.5AG24XGE060980@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: 375f8df26be1 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 375f8df26be16b58ff9185823e5d90761d2144e3 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=375f8df26be16b58ff9185823e5d90761d2144e3 commit 375f8df26be16b58ff9185823e5d90761d2144e3 Author: Colin Percival AuthorDate: 2025-11-15 15:02:27 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +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 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)