From 79e70e12f5c9679139427b3c366e592b585b0ee2 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 6 May 2025 13:59:06 -0400
Subject: [PATCH] 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 1489ec8dc88..913fc8f2b87 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/