From nobody Sun Nov 16 03:12:02 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 4d8GBX0d4kz6GqJv; Sun, 16 Nov 2025 03:12:04 +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 4d8GBW1CLKz3n6s; Sun, 16 Nov 2025 03:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262723; 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=5aoSwJMQveq8frv9vR7Oa016G/LeNYZ9lEPJ/e/PjV8=; b=trj++B7wOCxqNDtcyJbWlGHK5cPdNpuiIXTWtvHEUnZ+t//wemwZeHHe2gJNzTxJaf6aSL AokRwjSupoh3RAHlN+DnBpKmQPiQ68qo5hwEaob/xBuKUDtFth445ZpQIaBpwCY57gj6cP uweePlTcM1+BGhHhqselOU1ZKvaWRbidnjZzZJuWGeyFrBccd+L4oEjvbXhDpVHVFWgA3u eNJ+iVID35vIC15SGlK3BlY+9ZKyVELFzZg4GHU+SWIDuwDh2WLi0vLxfras/rKpZ72DAt zQ3fTAbK2XY2ina4Wn4N8BnFYeYg8rj3cjPH2Qcs9d4zX8DIr0wgACjZp3lxCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262723; 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=5aoSwJMQveq8frv9vR7Oa016G/LeNYZ9lEPJ/e/PjV8=; b=drSiKUpkxluj6HSwnAHxqBwykx+ZYmt/dRoMivl2iDSFA64MF1TlQ91HtfqLzTaMznoTdk WRGdxDe61Q/14CAFrJzuL7d3TczZ5xwAsjX9uj451/LGW+HtER0dPy5TlprcN9qgn6SBCH EpRZ1TzeM0VNm3hdKxEp4S8Rra1b+gu7fYdxZ4UtPhgFcaDEK3GygayPK9kFYm8DAE6KRI 0Ug+Ik1kRqTtAWYBre15Vxi7kbUm0Ub/x6bKXT/u0WxxFhO3BM63WArJNgyRXf9IDnyhco KF1ny5L9KmjFv/Hu2Hk/kWDrmc+etsVi8dZbSN/3O5ujwjKoXUkXLqfoOm+M/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262723; a=rsa-sha256; cv=none; b=FezvoIDuwosvU9PBk1nkn1VWiAGAO5qxLpZzsLGlDX+EnYRsEuiesGr7Ei+x5ivu+Oz5aO y/skm14aKHiynGmhLMy5P1gpR3uHiz3BAGBHPLTDq0CCueQvlNYE+iS4fvqEP6VdoedyTE l47wZO06eBo8dtXZwbEp03xRZO5lc07Vko3ZfRYAQLqELG57Zo/K4ZewYqMX9vzLMNXfVG 0cqS11jLHHIgI7HG3GFi8OkgaJZTPQbYLXJJOfOgmZIIkKO6pb7N4QMWF9M7pUzks2VenH l6eGioX75a45knq6KIesQt7HoYY4G8OJHM/nC0jGkP+j7PADA8twIZEzq0GzKg== 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 4d8GBW0X3vz5SV; Sun, 16 Nov 2025 03:12:03 +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 5AG3C2jo092461; Sun, 16 Nov 2025 03:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C2We092447; Sun, 16 Nov 2025 03:12:02 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:02 GMT Message-Id: <202511160312.5AG3C2We092447@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: c0a98d7f9daf - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c0a98d7f9dafbb52a533ba7ef3df51895141b2b5 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a98d7f9dafbb52a533ba7ef3df51895141b2b5 commit c0a98d7f9dafbb52a533ba7ef3df51895141b2b5 Author: Andrew Jorgensen AuthorDate: 2025-11-14 18:06:52 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:07 +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. Approved by: re (cperciva) (cherry picked from commit 0a8ecca4e3156bcd4ebbfcb24d968e67a3a09434) (cherry picked from commit 93769d225fddad4bc56f4edf543de45d8b666734) --- 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