From nobody Tue Nov 18 02:19:37 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 4d9Sx538RTz6HQRL; Tue, 18 Nov 2025 02:19:37 +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 4d9Sx518Vvz3R52; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432377; 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=6932Ms7aAUxWl473g5rxIz2BgFYVc9k/tcc/1kOv290=; b=RzUWf4Z8I7o0NZdLoewhBd5ygwX0Ja49I9Qp/kkjiLE2VoShOxj2cwPfw9gZBnxxVgBawu 6uBnjGB9/bqTih0IpqmGmWwLbUivH/EhH8LAiUnp4oyk6EeUXOX8J6UTbFM5Q2RLO6qVLK jmK/Tge4j/jWsIPoN4ZgDwq6QngHZx6PSUsK7oGsTEGRjqTU5mkhIwVNvWIqJvvQixh237 MAfDM+qiqk08tWpbM0TGlKPrX9vGlDu4awWEbVJXvI4fvCfncGSANbUnMjbEp/OTMuQTD2 bf/8KHUuYYS46/9HA7qeqgI+tHYUCLGbAFNWgxLmMPOLACQAqJVXXWZYcd2aXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432377; 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=6932Ms7aAUxWl473g5rxIz2BgFYVc9k/tcc/1kOv290=; b=SRk+H8G3pl2CrVRunlcKPvD9/T8JZEc18cmUYKu5grAfZeXIEU63w7B7E2VyXdm8K08KtT aJGvsvkX4ABmL6NFpbnRmlMjLNmXQ9qLG/LvONxP8PPIdQENSgLbYw6DWD+KgdCb5IHSrF 1EQe3ZX1222V9EQBYJEPDdNbit78XNyxHT8Wr20mIXGRR0BanFK5GaBvLNPlpMLaub65om Ser1GuLrZXK45Ubsek5n1mnA95DFrsOzExOMAS5JYCzWEfHztkZkfsmkpzMn9u7UbsLaox 5znwp2caatxAPdW2VgaHPqaad7sH/O6yGNFYeYFqpcAdNx5FIix4n+TCD/rFrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432377; a=rsa-sha256; cv=none; b=VGqZuoVe6WK8XC80iHkupon7AAtOkOsVehKIOpRyzPOBb+lSTJN0CSUJ1oJ2YrQmqvv7q2 832iyAtmrCywFIPWAkNk2Q0/aTYKD13Yy3fz0r0kzTO/1Lmzzizs0xxNLHHp3rqqMorPuv nKvvkal9nJsngNMXZ4LGTs3HBcd5pS9DTHvliFXFHwYURLaOA6LIuNop61MRZo36cU3Weq P8mJSz2N5VdxehoVCmgv9O9c2wkmOHfRrJFa9Fh6fV4LHjHqye14YBl3IRdw5GuUNGQkIC Rm1gcFQDlwtAJom97stQ8KmEQCeocCwgQu7xRcS7yjNzTRBZxG46aY+DTH8uxg== 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 4d9Sx50mPTzbXX; Tue, 18 Nov 2025 02:19:37 +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 5AI2JbDP003653; Tue, 18 Nov 2025 02:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JbEV003650; Tue, 18 Nov 2025 02:19:37 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:37 GMT Message-Id: <202511180219.5AI2JbEV003650@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: 10ef3bf823c5 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10ef3bf823c5d5db0303eb1552f1faa47cb0e58c commit 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +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. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 (cherry picked from commit 0dbb00733c4a177a9a22d61a627d377d0876ea16) --- 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