From nobody Wed Oct 22 18:32: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 4csHpK1ySWz6D5Mt; Wed, 22 Oct 2025 18:32: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 4csHpJ6cTjz431B; Wed, 22 Oct 2025 18:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157960; 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=zagh9nynv1ScdEfQck4DHVdpj1nCGzee7un2RA2pz6I=; b=CVj9qPku/YB7bvMKKvOE8ojD0lxE9GAJFydXkRU7XcYF3kkO0w8b2UaQ0jiTwdUW5t7ub7 CTQUfChcG8dhEhbylBDG3ds3XFbZQ2FXpu5XdVsj6oqfU7amHfsCnhaxOvss6MKt6npjkz 5dYVJUUOgnQrshN1FQg4VsD3o4c3bJqiP38Q+6y4wBRezcfO+4phJDwvmBAnzbDl3jVxov 9GO7QWMj3PRVli4GIiHl+xgxZdKi6P2vS7Jc+7H7dZxjL7HFuaz82Ry84O1K+PJ9rIUoVB VCFYlvJ+jU3K+JZfG746w3xYsuicrutqb3We3PK+1i77pFFEc4hMB/+A0Sluzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157960; 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=zagh9nynv1ScdEfQck4DHVdpj1nCGzee7un2RA2pz6I=; b=O6wbQZRBV8byElkY2zSkEAXOBv3jzJRpVn8nqbaUlY0W9Qb7N2f/eIH5NVNFJxIipcpkC8 zh8WgwhSQR145m0BZrJYKWaBkHgKlqbx88U8KG/geIWyo/DJv+OAseAfcpWz9fvZpy4Qnl eoOJVhyaRSA7ulDRGD80vbh8kSaqbr5pEm76esivEJbm8H6UsAqVBszfPwqe24TYxNFJeN +1FFLeBeQq5RD+x0Y2dSKqFgGtgfxuJEa4lI8Tu74gkhd0KDik8Zj2vtwg0n1furWkQAHb RmjTTLTz6hhpIpezabj3K+KQZbocqlOhX/vJNqjzt2UvouTWlz9JXuUAJ71YFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157960; a=rsa-sha256; cv=none; b=G8UFYPpdLJsupBb5z9U0Hg9ZubgS9CFeAV69XT82PdaJP5D1biG3C9Ihtc+WS/jDcvun2t zyfX2Sww87DUn4cOFR3jEyWy4OBNrnuQQyCl+wvtwEngNSpxy3XfxCjdC9xAp/HqqejxnT iAfEQy74Y6bPSIANDuff9YhMBGrqY1ppFYSP2cOnpcv9oVnNtEfmqOHSCP3QlZm71PIBtq rJDiUTNb1v+h8tE4VdOnTw5ubApkp7uAvRNVKpodWxcpcgS+8Es7R7kRKQg5pJd7+svwqF rxBmanK9Ljrb2jzPQdBFgDS4j26i+/KqsG4VIr5Jky09CqC0NhAR+vF3YOGXbQ== 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 4csHpJ66LmzhVX; Wed, 22 Oct 2025 18:32: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 59MIWeT3043471; Wed, 22 Oct 2025 18:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIWe34043468; Wed, 22 Oct 2025 18:32:40 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:32:40 GMT Message-Id: <202510221832.59MIWe34043468@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: 74cd979bcbac - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 74cd979bcbaccd8a606704ccdad5bb040e4e5795 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=74cd979bcbaccd8a606704ccdad5bb040e4e5795 commit 74cd979bcbaccd8a606704ccdad5bb040e4e5795 Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-22 18:32:29 +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. Approved by: re (cperciva) 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) (cherry picked from commit 52ea1ca18a0674e5085d6d0ddbc3c13bf0850429) --- 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}