From nobody Mon Nov 02 02:16:44 2026 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 4jHwLj1HhHz6yR5t for ; Mon, 02 Nov 2026 02:16:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHwLh62Dgz4LTN for ; Mon, 02 Nov 2026 02:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793585804; 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=9OBXSn5I5qAymVY1TNszmXW0K1VKc1Zcaf4GPs707Zo=; b=oZBdFlsaFyeUJ5cRhmK9mUMjZA3cFma7HLghinqIjPR/F6TqpxNWwuP9ehSHQo2P9zvvaM LankLEIaJgdL2DWCjnHQ3s+vxm6L+vGKArRd2hx0h3vYK9EvBCejJzY1Es3asakmuR8hOn TfWy9Kl+d2ISYzYN8d7UuHsrw2sl3ItTtRmVJC7NBZZesIOnkBTBUf4tX5ZcjI2ttpPWW9 nzfWzR2rYIYPuYgNTL5kfBow0JaJGUMvjV/7mxl1DcmLxH6+f4u1YP68QN0J0t9yoY/N1F OThwY6LPQ0zZ81a4btTHkIrf6FeONhgsHM7Z4DSN0o8b92Fp+O22Fxie5pxB3Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793585804; b=nJnj2l6ce3j7lxILYh+GTZwrs7aysGWSNbI2jRadrCFQZfsVEtRdSAmWXf2nBkX6qw1W7e P6WQ4GMqSlazM6HRlZCHapy8zXpSjs/IaUs34ef0eDltx9J6JDzgTxb3/CPJNf7BeLwJ8i uDRw9Qj2DCK0QcFpAwHHXon9TrQmi3GPiczFupxqIVZJIrEyGSD3JwYXeIocAEKesjvJuC T6khpIO4s+aNjGHcdAILXswjHAHIMQIgUmoe3JY6fSyS5EXvE0tHzhFZUc+Ym7AGh55dbr dDqqQeuiGvFwG4RuRGiLp8WpmaZmMY4rEBAzTKQ4NRQtCFtC/pKBODq6GhHYRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793585804; 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=9OBXSn5I5qAymVY1TNszmXW0K1VKc1Zcaf4GPs707Zo=; b=JQH5OxikmtMblYH13Sfg7WMxQHS3+r9v2FDhSObtG7WAvQ+k6tA5mJZ8jTfAibBho1p+7i bfboVoMy95mFYzm72cEYq5yGnwkqJXETlmHla5FmLOxgWD3UNkw/mYrohdV7G1xEHG5OrG qJYnBraNv7i0hh7ITr1w8i9o8/PQanXTTAmPWzIYRibxTFCToTyMqIa07t2xqBocBTIeHA jcRLqZsFV8/Lf8+agRQBP1GmVXxvf8kdewlASuW4gP8Bmd51J9U5Gen3edT33mQ+V5I3jE yNtbCBvPjLrAYuToNix4rfbLGjzEpq0cRuyLVsVlzHbHzdQflfJxBxe8ik9B1w== 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 4jHwLh4nLpzPv9 for ; Mon, 02 Nov 2026 02:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 02:16:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2650d01ba0c3 - main - GCE: Copy /usr/{src,ports} directly List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 2650d01ba0c388fb1fe77ce2a7d40faf8f76a0b7 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 02:16:44 +0000 Message-Id: <6ae7f28c.360b4.42b336bb@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2650d01ba0c388fb1fe77ce2a7d40faf8f76a0b7 commit 2650d01ba0c388fb1fe77ce2a7d40faf8f76a0b7 Author: Colin Percival AuthorDate: 2026-10-19 01:14:57 +0000 Commit: Colin Percival CommitDate: 2026-11-02 02:16:23 +0000 GCE: Copy /usr/{src,ports} directly Distribution sets are going away, so we can't extract those into GCE images for all-source-code-included compliance purposes. Differential Revision: https://reviews.freebsd.org/D60944 --- release/Makefile.vm | 7 ------- release/tools/gce.conf | 48 +++++++++++++++++++++++------------------------- 2 files changed, 23 insertions(+), 32 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 13b6d993d07d..187e0937800e 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -127,13 +127,6 @@ ${_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} \ diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 938672ac92e0..079fcc7cc43d 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -105,31 +105,29 @@ debug.trace_on_panic=1 debug.debugger_on_panic=0 EOF - # To meet GCE marketplace requirements, extract the src.txz and - # ports.txz distributions to the target virtual machine disk image - # and fetch the sources for the third-party software installed on - # the image. - if [ -e "${DESTDIR}/../ftp/src.txz" ]; then - tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} - ( cd ${DESTDIR} && find ./usr/src ) | - while read P; do - metalog_add_data ${P} - done - fi - if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then - tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} - _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/) - for PACKAGE in ${_INSTALLED_PACKAGES}; do - make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ - DISTDIR=${DESTDIR}/usr/ports/distfiles \ - DISABLE_VULNERABILITIES=YES \ - I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES - done - ( cd ${DESTDIR} && find ./usr/ports ) | - while read P; do - metalog_add_data ${P} - done - fi + # To meet GCE marketplace requirements, copy the src and ports trees + # to the target virtual machine disk image and fetch the sources for + # the third-party software installed on the image. + mkdir -p ${DESTDIR}/usr/src + tar -cf- -C ${WORLDDIR} --exclude .svn --exclude .git --exclude .got \ + --exclude .zfs --exclude ^release/obj --exclude ^release/dist . | + tar -xf- -C ${DESTDIR}/usr/src + mkdir -p ${DESTDIR}/usr/ports + tar -cf- -C ${PORTSDIR} --exclude .svn --exclude .git --exclude .got \ + --exclude ^distfiles --exclude ^packages --exclude '^INDEX*' \ + --exclude work . | + tar -xf- -C ${DESTDIR}/usr/ports + _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/) + for PACKAGE in ${_INSTALLED_PACKAGES}; do + make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \ + DISTDIR=${DESTDIR}/usr/ports/distfiles \ + DISABLE_VULNERABILITIES=YES \ + I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES + done + ( cd ${DESTDIR} && find ./usr/src ./usr/ports ) | + while read P; do + metalog_add_data ${P} + done ## XXX: Verify this is needed. I do not see this requirement ## in the docs, and it impairs the ability to boot-test a copy