From nobody Sat Nov 15 14:50:35 2025 X-Original-To: dev-commits-src-main@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 4d7xl01068z6GQlP; Sat, 15 Nov 2025 14:50:36 +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 4d7xkz4wgnz3DGn; Sat, 15 Nov 2025 14:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763218235; 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=lA7/Vqz5PcoXgtYZtoxMKcySIMob3/7bLg33vwRt2+M=; b=cRwWX7cYPTkdrtEeA6xqkL30AAhQgPwmnz098HhDtjL2QqIUVe/aX8Zn4J/Pl5XFbjVksu AMzw7W7G5ogvEPSNzm+S/HngjkBHrh6Eq/QkOwZQjfaLQSo9Tuv4kQVzBAY5t+3dN8mdGm anE49h1zeCBwpDQZTayqhPwxHzi+prMkRdwp/PxNu8SjCQCEl00U3F8ZYNXydnOPnOHGcB e0fJNxPSzqaOeqAUYfRkmOD/ox0BnTT+hnHKLIigj2bVX+DNX2MI2h1ZlWjOMWP8HV3fL+ I41BQXBuPaGCwKzi+ZmocRu2cuvKLr1Ze6sulZIfBIpo9PqaGJD7JaewnC0Q1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763218235; 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=lA7/Vqz5PcoXgtYZtoxMKcySIMob3/7bLg33vwRt2+M=; b=JQTOEM9QP9cHhxDIS1DdX2w1OMqtAc6VsJsrMc/Y8n09XscOMHDY1n3LjgdpShSUWPcTPI 9xEaS7c/xC9zXfk1InZ0f+HQW1peldFBAnwH1fE5GUhXdGMrZpzFjcsiCyK7f/5EHKt7IQ jIs37OjS/i+nIZ5VjANt0rl7vAxeC5+klgzBndbeoomheikjU/FFb4w2N84Bd218AcflpU g6G5UBkGw+LFhix12onneVZmnkrCC3VCdiIv0cF61uXjR+/NAAhHPuk1eU+PpgsD76xDzn CJ/PjUysMCyqPuoRVN+rbdJKKJ31bStXwo97GyDgvC2mz0msE0xHnE30FuFjPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763218235; a=rsa-sha256; cv=none; b=hnqOX0TE8StoMqfAYKlkmpXVEgIAZOKiLQz9IFXVoTYvmJoAnjfixw/cpZjkk644dpgZet jodTcQ7zR9ULSHtr58DnCxRTQJoGQEkxNYV68S0tCFLn4ADWFkDTGTMkqAcF7PDsl4MOP9 HoEov6LJqgRVIQz/ZGSpqlvOw3tea56toJU5riH5e81OxSTA4QhvMguzVr35VkNKqukToj 68stYoLN2ITLHzVnQ9eRPYkOzg8OVt+chCStDtXIv3xqqOTYdN7jktlB9gejmEhpyNkRwh UBeGR/WZgKAC6o3e+4ZczsmTN081ED/cOESx+O3gDUtSEXIypuEkIea2/dCB+Q== 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 4d7xkz4M1jzxJb; Sat, 15 Nov 2025 14:50:35 +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 5AFEoZiC095235; Sat, 15 Nov 2025 14:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFEoZOj095232; Sat, 15 Nov 2025 14:50:35 GMT (envelope-from git) Date: Sat, 15 Nov 2025 14:50:35 GMT Message-Id: <202511151450.5AFEoZOj095232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0a8ecca4e315 - main - GCE: Specify the architecture of images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434 commit 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Colin Percival CommitDate: 2025-11-15 14:45:46 +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. --- 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