Date: Mon, 12 May 2025 00:40:27 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 79e70e12f5c9 - main - release: Pass -N to pkg-stage if NO_ROOT set Message-ID: <202505120040.54C0eR0r017583@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79e70e12f5c9679139427b3c366e592b585b0ee2 commit 79e70e12f5c9679139427b3c366e592b585b0ee2 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-05-06 17:59:06 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-05-12 00:40:08 +0000 release: Pass -N to pkg-stage if NO_ROOT set PR: 283387 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50268 --- release/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1489ec8dc881..913fc8f2b876 100644 --- a/release/Makefile +++ b/release/Makefile @@ -321,13 +321,9 @@ packagesystem: ${DISTRIBUTIONS} touch ${.TARGET} pkg-stage: dvd -# TODO: Support for -DNO_ROOT .if !defined(NOPKG) || empty(NOPKG) -.if defined(NO_ROOT) -.warning pkg-stage does not yet support NO_ROOT. -.endif env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ - sh ${.CURDIR}/scripts/pkg-stage.sh + sh ${.CURDIR}/scripts/pkg-stage.sh ${NO_ROOT:D-N} mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505120040.54C0eR0r017583>