From nobody Mon Dec 29 03:28:05 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 4dfhWB0Hvnz6LbNP 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 4dfhW95Jsfz3v17 for ; Mon, 29 Dec 2025 03:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978885; 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=WM408knut/Im0/FG7TH7niLVgmTDI8llawCovFzL/LY=; b=xey4vRi4JJ2SVVMQ4j77q9tkqAuZiwkNeqxq3LySqSIz9ie7LhRWbMcLmIA88Gy+rA968l cEYw0u4jScQw+uII91FnvxvRbbiAOa3KTjMsSa5frSV1hlX7FxEmrpvD3MEDKRgY/iAx1b uhuvwdQFPS/MnbMUDrfDl4yHfVAtt7RM10jr51BiA1PTz2Se7aVo1HzqDq4+AFBLK7O6+O qhVWA28YS+sNE+qqd5k3WN9GKDDMDdQOsRAD135pw1hcO4YScDPY/RjEF/Ea9lHCjxC12W ziDeKpIl9w/yKrJfDsa7l8PrPdvzelatvsYxJ18BIJVUl4hY2HkxypuMBciDvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766978885; 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=WM408knut/Im0/FG7TH7niLVgmTDI8llawCovFzL/LY=; b=vCp8h3yKsce1SH5+R7O37UnIks0ShSEgqb/ASjU6Oqj4yztJkaZ8a+h9sQgelCZCJNn+LY qbYwE06Q7WS8lrhuYHIXS5OXguDr1DJsXwI1fMRl+6CKdKyjDVW2X96ZGuV837cYCTKpTZ svLdHrUvvXlPIs90pxRxp1kIcPjg9pHV5c7HDYvXdFSpEpO0DiVGq8CeHCsiVc3017OLqb JkBeFKrjYdR3pd8qKAS6HBQaJAPMfOidlzg2KMY0PaPL8XzEuPb1rEtkzSbASdvB/pIG4Y LyX73+SpA+Bir6Gima2p8/+Bu7eS6kp9EraF9SG/CmWmR4+KVqo1njl2ZnAMdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766978885; a=rsa-sha256; cv=none; b=XZN8nsJjOTs+QDEx13a8Y24fDAJO3CpDJi0w1GG0XcpEPlhuvRkPgysSdvaE2cpbx0tLrO QoZrkKIWm7fjVJWzYIn+acOb+AMyuHObbYFXEjQWP9CByxSuM+gQ0rvhyIWiXhvCwdFbya vcU9gSTaMCm/R8B2iTv8DW1b7BBpUbDtZXNj2LpXrqYX2YTm8/Q86bV9/8Yos8M+kUetfJ oGH8N2xwGaz1W3bnlWQ43JjPIhVZ/7ZICToEEVFzgtYm1za5HqQ9tz6ekeZL4x3jqttAP8 7Wvzm9msrh+bpfOk9tXgy2lALhh57oDe0nOSluWXvyBB6U8SpvajTE8Iy6JaSA== 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 4dfhW94XXRz1C6t for ; Mon, 29 Dec 2025 03:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c5b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 03:28:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Jorgensen From: Xin LI Subject: git: 86b5e5bb7814 - stable/14 - GCE: Specify the architecture of images 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: 86b5e5bb7814f4f972dc29076969d06cd76567cb Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 03:28:05 +0000 Message-Id: <6951f545.c5b3.4ff315ca@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=86b5e5bb7814f4f972dc29076969d06cd76567cb commit 86b5e5bb7814f4f972dc29076969d06cd76567cb Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Xin LI CommitDate: 2025-12-29 03:22:19 +0000 GCE: Specify the architecture of images Without a specified architecture, a user can attempt to create an arm64 instance with an amd64 image or vice versa. With the change the API will prevent that mismatch. (cherry picked from commit 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434) --- release/Makefile.gce | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release/Makefile.gce b/release/Makefile.gce index f67cc5da8d82..31bed380f56e 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -17,6 +17,14 @@ CLEANFILES+= ${GCE_UPLOAD_TGTS} GCE_BUCKET?= GCE_LICENSE?= +.if ${TARGET_ARCH} == "amd64" +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." +.endif + .if !defined(GCE_FAMILY) || empty(GCE_FAMILY) GCE_FAMILY= ${TYPE:tl}-${REVISION:S,.,-,}-${TARGET} .endif @@ -76,6 +84,7 @@ gce-do-upload-${_FS}: /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ + --architecture=${GCE_ARCH} \ --family=${GCE_FAMILY}-${_FS}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz