From nobody Sun Nov 16 02:04:32 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 4d8Dhc6ksfz6GjPZ; Sun, 16 Nov 2025 02:04:32 +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 4d8Dhc5Dlmz3cTN; Sun, 16 Nov 2025 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258672; 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=wErPGRDaWpZqh1pgxq45bP1ysmtjBQ2blcv5hWykT8w=; b=lSLrBm56bjajVgeuqpt2BKcWf1G1XiKVZnhuugJ9H6fQpjllz1ZOPaBva5+3YLQL4Z0nXs b934xlYqiU0on8hVX1mME2Psy+8XtJiHT5f3cZmMl2wzHGg8fJYR2wkVdK8JpFsaQwcDE5 08/q4hswqMZKMzIWUu17tO6SWP18jTR8m5zLfaUEUbA+jAOA+7r0xt2Q3OUMzjLesBiyO5 guoqgTtyjbYksnZVMCAGw6fpXMWjyvvMQkJUXLF8GDz5eo7QMb0/iwCKAOWTf4fiVFbkfM V/OqFbZiUOQX1XaSWUFavpAr44EQyYDrsnHnXwZTza5sTmrt/GYpih+rZcp53g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258672; 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=wErPGRDaWpZqh1pgxq45bP1ysmtjBQ2blcv5hWykT8w=; b=oTl/0bb0jxiVHYx95CUK/GQSGVNE9WnaUmILFHnUTyzrfLwysRoJNw1l6bJDti4GfwBxQq Z3O4S4JJ+WsPtsrj0vl0v1RCUtiEIr0efD0m3AWfv67/TGNmruZY4TXiX3QFNP4CCxr9a2 VHjZDPSRM2+4R9USMAyYXPjZy4L+0gdKonPbYwaHronunY0H7WwdnQ8fLKw+PIsJlTMgu+ TObIbrcuG0AOXJ3t9IDhgYfXMd5YkLN/8RQmlrWh446yS0jwoHUKMG0nUiPyQH7u4v3Yy3 OJGFQXBos27C20SMz3EwmO3TiW4h7/qTrp04dyftbyHG5zfD74TYX1+/+CFr4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258672; a=rsa-sha256; cv=none; b=HGUYACtjgMLxarIJ1d2o2t/y5vbgAQEAJ10OKxxTHYwzF0/R1NYxza6lSvrHSWLdH+tH/U YrXmb+aVc8WBzbh7p16+sQcMRmGPsxVbOczn0R0pmT/IV5XdWGMFBA6M6c1SZSZWrK47gx ldAI3vNHGPrY2gP1F3c2/o08e2mdQInfy7h6NDK+Ou1DoZvuSrgmtIBSboScGfUzfCQy/5 jz5+yEYLMzseAuMjHsqaj0tdzdHryvO0IJBxFZlW5KmArwwSeQj8SkkFFUjLUe5dn8nQLK pTv1otqAwvwMcahrihHAQC83gPS7imKryl5NatuM1im+Vl9G7NJQ4xiCMJfyhw== 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 4d8Dhc4bXcz3mb; Sun, 16 Nov 2025 02:04:32 +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 5AG24Wd5060946; Sun, 16 Nov 2025 02:04:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24WlI060942; Sun, 16 Nov 2025 02:04:32 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:32 GMT Message-Id: <202511160204.5AG24WlI060942@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: 93769d225fdd - stable/15 - GCE: Specify the architecture of images 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: 93769d225fddad4bc56f4edf543de45d8b666734 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=93769d225fddad4bc56f4edf543de45d8b666734 commit 93769d225fddad4bc56f4edf543de45d8b666734 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +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 a6d09de468c0..21df4ddbc3f5 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -15,6 +15,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 @@ -74,6 +82,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