From 2fa091dcfb2b973704aeb25fd8b0499f638f8114 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 10 Mar 2025 14:15:10 -0400
Subject: [PATCH] Makefile.inc1: packageworld: remove non-NO_ROOT cases

The packageworld target requires NO_ROOT to be set (and there is a check
that this is the case).  Remove the now-unused non-NO_ROOT cases.

Reviewed by:	brooks, bz
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48590
---
 Makefile.inc1 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 9cd4d3b63ca..3569d068095 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1568,28 +1568,16 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
 
 packageworld: .PHONY
 .for dist in base ${EXTRA_DISTRIBUTIONS}
-.if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    ${TAR_CMD} cvf - --exclude usr/lib/debug \
 	    @${DESTDIR}/${DISTDIR}/${dist}.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
-.else
-	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    ${TAR_CMD} cvf - --exclude usr/lib/debug . | \
-	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz
-.endif
 .endfor
 
 .for dist in ${DEBUG_DISTRIBUTIONS}
-. if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    ${TAR_CMD} cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
-. else
-	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    ${TAR_CMD} cvLf - usr/lib/debug | \
-	    ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz
-. endif
 .endfor
 
 makeman: .PHONY