From nobody Tue Nov 18 02:22:40 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 4d9T0d1dVnz6HQQ6; Tue, 18 Nov 2025 02:22:41 +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 4d9T0c5xbSz3SGQ; Tue, 18 Nov 2025 02:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432560; 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=Xef58Nohh+CbMsotKp8ijTGaQWZyi1totAmgfxYeQ/U=; b=Zl/pqv8hwL2vv/jcCYDDEKZX7rYMEaEqspfO1T6a5GNft3HZJF9P1SUQPaUPC3Gkt/Axtm 5Ofpta9vBg3cYWEtdq98fjVQdjwiv6AWppdQjnWFXoRlYCa9FN7Lc2wToMUizZlSjjhZan H8Yj5zR+AfFADuanQlozQlCYu4vNtb8zlOtt4FAiFAPavLRWqyfebD8DLv09Parm/yShIf 3+RKntM3VQkLyLmSIp2qlhljSY0/qXNgjOs+zjEDqtAIWqjiCDvS5EwOogIREOxwowr5kQ 98ja4ajw7PUm4C6CqZyw4E5XgklfudSEv2a/hGdBP2io0JC1yV4aEVr7tnqcFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432560; 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=Xef58Nohh+CbMsotKp8ijTGaQWZyi1totAmgfxYeQ/U=; b=IIGCx8DrJqz24LZa8r2Ee4OY6P18rQHUyPfkY7vIMxX5Xi+SoU+rzLdhFxUpEHFK0Ft2PZ huFsaCd+hiPc0n6olKJjYTAzmJV8FFXUfczpCyBn8xxqI4BzqmPNlYbGyszYKe/7QQETBC YIkNlzgjuovAoYjY2SVS9w05/Iorvb2FUyCeJyMMuL/VrEK17Y2PmexdNCm+8qFF7qGl8K cVh218lLQrmYGZduzvjyn4F2lDKuVF7Mz4V2oTXDYJdZINisY+OdaBSwKbnkynAXHolfeS PKaQ0yeD/sy52a9jAa7CYmlFUWKK90MRbK5KgqkX3iceK4S+pRgrj2w1AI4NQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432560; a=rsa-sha256; cv=none; b=JYt9U3ZC7zengpK/d9icHkOf0uouq83CCGc//emyDEyFl1PTrkGYmpdztYpPNJJxm6JXIK bvGTYCRT4k2GEJVF/cUgDoS7fjCE2QxoCwFbB6YAKMW7TVkU/FK61CHv6i9FrU6cfbto7o pCZr9Xq+GmPQNw4Cd/WoIDj/YGD6+CxQcrvY7CwnbGjg5VXt4Ak+ZDvs//CfmU4MXnQ9bS 4Esp00jC5FEEqDtY7nzpauG1gcwd1gmiTBn0OuKa2m7Je69/eFi/JG4g1X8C7tjQZUmDqP zfPtlbsRemPCDQ+3lQm1O5/hvB7I7XTmCpobBT75FqIkkfI4yVxrec7iNUrtAg== 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 4d9T0c5ThszbyT; Tue, 18 Nov 2025 02:22:40 +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 5AI2MeLb020950; Tue, 18 Nov 2025 02:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2MeDu020947; Tue, 18 Nov 2025 02:22:40 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:40 GMT Message-Id: <202511180222.5AI2MeDu020947@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: 0f4c3dcd1e07 - releng/15.0 - GCE: Add /usr/src and /usr/ports to METALOG 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: 0f4c3dcd1e0761781e5636272caeb5d50fef3e0b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4c3dcd1e0761781e5636272caeb5d50fef3e0b commit 0f4c3dcd1e0761781e5636272caeb5d50fef3e0b Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:35 +0000 GCE: Add /usr/src and /usr/ports to METALOG We ship these in order to comply with GCE Marketplace rules about providing source code and licenses for all the software we ship as part of images. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 (cherry picked from commit 0dbb00733c4a177a9a22d61a627d377d0876ea16) (cherry picked from commit 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c) --- release/tools/gce.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 78511dbc66c9..c1e129ba69d6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -98,6 +98,10 @@ EOF # 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} @@ -108,6 +112,10 @@ EOF 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 ## XXX: Verify this is needed. I do not see this requirement