From nobody Mon Oct 20 21:00:37 2025 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 4cr79x5JMgz6D7WV; Mon, 20 Oct 2025 21:00: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 4cr79x4mjxz3TYl; Mon, 20 Oct 2025 21:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994037; 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=QwQlQDQaCvgckeeWVhz2FRfJUC6iG+3uYlMtLqwQlFs=; b=EEJbo5ddN6gUXwKt/UOSag+KQWTZLE77AZjviBR+so20Y7ALiZmiln8sWt4yeLTfSyex4k oWzqz6YBHQYymv6TtfMME4WMY8EFln8urucZuiNJuUJhJt5S+NDR6sKWrOD84UWgSSF7qp oJjRBZ5fKdgFw7JuCMCtINFFl4sURUa4QaMY8l+wQ5y44yULNYYfRahymS7Fq/Dt7+CYGu YK5/IZeFp0pmqMjXBtabDNjlGJ1gSEN76/zHk++bgFK1jpAWfIzDuXSMGN4WfmOURWq+7G XXuOx/e26cO6xFvQvthwwafAozUAg2zQ39nkpBJSTg4hnVEw8wtlFJW+oUVEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994037; 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=QwQlQDQaCvgckeeWVhz2FRfJUC6iG+3uYlMtLqwQlFs=; b=qalFeNp2d0ZcsIcPFzeq1l2UmGOHV5Vu20tfiIEegubrCirxOnZr8S6UBgPrHU1Jrma4+M 8CAUiTB3rWriJn+roasoHMOzliq+Iqa3DvDPb6HsjJCYmeGHBobpUilQ8ezTFzyPA9YDy/ KK3f7LST8HwZ4PW5c/HufwhoIif4JOQ+VdoWvbklQKMkcgQnyZ7WME/Sosb8w+LFYtyCBE Ur7HTvFWPtCG6Gt1aPxfhk9o4R1WxXHJcK6htsJ4bVBnE2xSRYeMZ4cvX8t5HnBqpQ7f9J cKt4BE45oMeuX+Rv8pKX6Vtdg+B8hOAQ5KohYwLYqKG7pd01uLr2qXxLO9doMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994037; a=rsa-sha256; cv=none; b=Ag+4TxP9G/M69spQVzX2YPxh9An0eFLZli9HDYODIICY5cl8/u3suEfD7rgxICA4wBrtWX f0lixV/gV/pmTYPb/dVSPh1ZK1JFfYqTNQ0pY3KKu7R5wHvNmMja/DH2Nl5DqGqle238BY 48x5GBd8SHkcu5roORADJQQ60g/DN9EScOldfnb31VHL1TW1+bXLnRsJrvH4A6mIFR3/iZ RrBGbFqiGKRugKSj9vU2uhwopRK/sSAAdKxgixZ56kq0UVJ/UF8BQkIvkKk1Owm1eUoiuP S9Vx5eRmo78rsKwslBBYxsivjDYHGXo/dR3oH1ik6ZWtgl9Bap09uYizeeU7tA== 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 4cr79x3xJMzDTs; Mon, 20 Oct 2025 21:00: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 59KL0bSx082806; Mon, 20 Oct 2025 21:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KL0bET082803; Mon, 20 Oct 2025 21:00:37 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:00:37 GMT Message-Id: <202510202100.59KL0bET082803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2b5c62494df9 - main - release: Add pkg .conf to METALOG on dvd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2b5c62494df95cdb844b5f6f852412f2178f66dd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5c62494df95cdb844b5f6f852412f2178f66dd commit 2b5c62494df95cdb844b5f6f852412f2178f66dd Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-20 21:00:26 +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 --- release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile b/release/Makefile index 13532097d56c..a777ded3c429 100644 --- a/release/Makefile +++ b/release/Makefile @@ -430,6 +430,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}