From nobody Wed Oct 22 18:21:16 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 4csHY92LGcz6D40w; Wed, 22 Oct 2025 18:21:17 +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 4csHY90Zkfz41LS; Wed, 22 Oct 2025 18:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157277; 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=s3EOCsdJyq9rKGV7DGRvbH8C9pavRA8qgGSRHstV7eo=; b=Mbt6K2exkWJBiIYj3IJpXveHk0/Q8aqA+/868fUeT1vG1jiP6wCjlu305siEo8vKJHqtDC uEQOwMT15AX4Bf1A8LWOOasovLCj/Qm8IWGAkETgtem1TO8clhEcVR8IfBcjwpryydpqS8 e1NhxlxgP02ZGMhEDejZPniU9a0kJ365Vga+wzLUyLxKvE7tt4dE+PNzKaMUlf5xDYUMa0 djlDixb3yA1kK9drHlisneYJfMQ/5RMwyqerpbnWZdx2OuuvQ7i8y66aolIYLdjFJb2NVF 698Wa4Wg9KFMuqzdG6bGr6aWwbSdyAiT1fyDR2lIdJXpF/bp+aQEf0d6CYUlSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157277; 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=s3EOCsdJyq9rKGV7DGRvbH8C9pavRA8qgGSRHstV7eo=; b=o6LpDUi4ntsEhfSun7OFZDzQcQg4GOU4/5a/RlVIJQgRAck+I6XgBy3GWM24L8K1ULG9EL RzPXCQ/x4cV98DNjq2WB6oEh+P7/Hyv0QGxvsfPuXpKVzwRXr/JfLFqn+a2m62x4RxBY0+ /M///Dv3qgEwd7o1qQ3p6LRmMgrIkfrmgz2dJrM+SPSqfMnGk9E6YdnFHiWtXnFWI7YaGI R1z249wyiHoPR2T/U0e4asREdq91dui/jhVtaJX2O8pu4oBB01o9KmgzIB3FAMgsVePGq2 WSknltWMZex+l+I9yhEBgVpnJ1pLlFdpFkSjUdXWbeNneR4OVAy8E+Jb8GQ2nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157277; a=rsa-sha256; cv=none; b=qOQC/Y4hT76HozSeDOMBt8Im/egWcciwjqlUeAGOPefqs5DmAJ2aD2zwzw5OzmgrvFQx5R 3tyVsFkvxqnZkDq/NijHsTwA+i/6p7MmrMAJvI4LvjXYzBpEvMwFNIWJrZFB47LjYuhnzt AX0D3cgWO86EaFsYlM2KIdqfqc9zhujFQY9HoipHMPLtpEP8g6nRN5jXtAnhQB1ZHPVwq1 9voJzRIl4HDXrQXs1VcctqeXGFhOkk1Ep0eW04lh72hOsSYLhOMeWfC+TYIbby5kqvQHID m8c72EEAmv+gyf9/kUugQpWsHrxMwz2dmeT5rezloT+OnWIajMA4xnmISQG9aA== 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 4csHY872zvzgdd; Wed, 22 Oct 2025 18:21:16 +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 59MILGa3018398; Wed, 22 Oct 2025 18:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MILGgJ018395; Wed, 22 Oct 2025 18:21:16 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:21:16 GMT Message-Id: <202510221821.59MILGgJ018395@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: 52ea1ca18a06 - stable/15 - release: Add pkg .conf to METALOG on dvd 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: 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=52ea1ca18a0674e5085d6d0ddbc3c13bf0850429 commit 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429 Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-22 18:21:00 +0000 release: Add pkg .conf to METALOG on dvd We're correctly recording all of the packages in the dvd METALOG file, but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then users won't be able to install them very easily. Reviewed by: markj Reported by: Lars Tunkrans MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53199 (cherry picked from commit 2b5c62494df95cdb844b5f6f852412f2178f66dd) --- release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile b/release/Makefile index 6b5b0c1b975c..c142bc35a45c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -427,6 +427,8 @@ pkg-stage: dvd mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/ + echo "./packages/repos type=dir uname=root gname=wheel mode=0755" >> dvd/METALOG + echo "./packages/repos/FreeBSD_install_cdrom.conf type=file uname=root gname=wheel mode=0644" >> dvd/METALOG .endif touch ${.TARGET}