Date: Fri, 17 Oct 2025 01:33:28 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: b5d5181d74f0 - releng/15.0 - pkg-stage: Correct /packages permissions Message-ID: <202510170133.59H1XSuJ037203@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d5181d74f0b78530df8b94a7248a409c3ea72c commit b5d5181d74f0b78530df8b94a7248a409c3ea72c Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-10-15 13:04:58 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2025-10-17 01:33:12 +0000 pkg-stage: Correct /packages permissions Include /packages in the METALOG used to create dvd1.iso. Previously we used an expression ^./packages/ (with a trailing /) which did not match /packages itself, and then with no METALOG entry /packages on dvd1.iso ended up with mode d---------. Approved by: re (cperciva) PR: 290222 Reviewed by: cperciva MFC after: 1 minute Sponsored by: The FreeBSD Foundation (cherry picked from commit 2db11dda840c4889aeb719761cdafa62730083a2) (cherry picked from commit ecd943a5af7d8cb09f9418a8a4d337a72c06fe22) --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index f9216b52b088..6d460a83e1da 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -110,7 +110,7 @@ ${PKGCMD} repo ${PKG_REPODIR} if [ $NO_ROOT ]; then mtree -c -p $ROOTDIR | mtree -C -k type,mode,link,size | \ - grep '^./packages/' >> $ROOTDIR/METALOG + grep '^./packages[/ ]' >> $ROOTDIR/METALOG fi # Always exit '0', even if pkg(8) complains about conflicts.help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510170133.59H1XSuJ037203>