From nobody Tue Nov 04 00:35:47 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 4d0qHl2VqGz6G61N; Tue, 04 Nov 2025 00:35:47 +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 4d0qHl1p4Xz3s4F; Tue, 04 Nov 2025 00:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762216547; 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=2D0LnaRtK3V9LeCo+wRtX2sWl0QpS9kn4SDpQNDDlX4=; b=e95xqx1WglTBLL1vzTzO82WmWOdRLqipHmtPSg6XgfMUvQisaNnXwXuwM/hO9t4muhL+cA P4ZWJQhxNJkkFLPSKx639iK9mM6mLf6l1fef57AZPUrptuNNVc/hmvoL8eo2L1qXs4lnbP e7QWJuhdbxYeyGg/xhX8PNhnXAlENx0knV924CDm94txT5BFu6fT64QJ0+3HRP34dtKXEM 9CJi6miQhkk8byOyfYs+ScVKPZ5ckuLUx6Ggbf8rmbLj+66Nl9umbOvx2lNk/r9tFcy25X pCJFxZMLNzv7YtNN4/woVzttvXDrA7VhcbEAofbpHFAefChjEXFPV2gCvp6iHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762216547; 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=2D0LnaRtK3V9LeCo+wRtX2sWl0QpS9kn4SDpQNDDlX4=; b=Q1mJYfDuRNUs/FBHtQhF10/WA9YuMDhbTzEGmw8anMXIiwJV7MfVfdST+59OgRtmDJgoGY hLY6Qwy64aLVjZ6wg+82ZmXWWZ6cRRusjK3v5+Rs+vwXOP5xY15HEwyEzFxiZ8N3VbS/G0 tSQPiNo3474ubWH2n3ZrYcK3IdFzRb3jNbyVcDGJEXvxpHUTdyGxeSX1boGSRBhOSE8lBI 6WbufYI3tk9KPfJ4KC6BwZvVSQlf2z+QyStE14YaL9aX0nnmVSWHADlkHsA6cpQgNnqnvy sykROkl4BS9mPYGlx9Ujs2IbDf+LjG/sq/6QRn+JNEkhqzokOe6b9aRIZfac2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762216547; a=rsa-sha256; cv=none; b=WVhjuyHvQXnZNxpYxUXSt4chhX3jNIcc8nNHm6hbWi88e64xVjj5jff7hn3imE79y+hl7b sZKlfdt/LaRt64fquYsQ22xlz+qGVI7zA8MUTMhZUtno+TKnytgUJ/pIotGNJNQtmEO4MV nqTpvNRdWaTxXHmmDNcVNM/UU+0Bk6k32rz3W6HDybakgiQa3MYuNORwV7ch1rZDp77u3N IRs5IpmKjtdfti8zV4bDA8QSmzMg1+ggCc57+wDtAS53eDYfEJrtCW7c7O6aX2CdTQpI0Y w+T8jBG6AmOZtXJHeq8mergYQt9aNZIbNiEchuMURRWXvvFv/tbwwpf4ETz4LQ== 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 4d0qHl1Nr5zbQp; Tue, 04 Nov 2025 00:35:47 +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 5A40Zlco020223; Tue, 4 Nov 2025 00:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A40Zlfx020219; Tue, 4 Nov 2025 00:35:47 GMT (envelope-from git) Date: Tue, 4 Nov 2025 00:35:47 GMT Message-Id: <202511040035.5A40Zlfx020219@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: 7f536b1c1146 - main - release: GCE builds depend on ftp 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f536b1c1146c4bc5cde336e1fe7a083f2874f11 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7f536b1c1146c4bc5cde336e1fe7a083f2874f11 commit 7f536b1c1146c4bc5cde336e1fe7a083f2874f11 Author: Colin Percival AuthorDate: 2025-11-03 21:41:14 +0000 Commit: Colin Percival CommitDate: 2025-11-04 00:31:52 +0000 release: GCE builds depend on ftp GCE images are required by Google to include their source code; we do this by extracting {src,ports}.txz into the images, from the (legacy) distribution sets. Make sure those distribution sets actually exist. Reviewed by: ivy MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53567 --- release/Makefile.vm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index a04f779ebebb..142fd6e7bdf5 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -129,6 +129,13 @@ ${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE= ${_CW:tl}.${_FS}.${_FMT} cw-${_CW:tl}-${_FS}-${_FMT}: cw-ec2-base-${_FS}-${_FMT} .endif +# Special handling: GCE images ingest src.txz and ports.txz and expect them +# to be in the /ftp/ directory. Note: This will need to be reworked before +# distribution sets go away! +.if ${_CW} == GCE +cw-${_CW:tl}-${_FS}-${_FMT}: ftp +.endif + cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \