Date: Fri, 23 May 2025 21:50:52 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: 26064d3e7463 - main - Makefile.inc1: Remove unused non-NO_ROOT support Message-ID: <202505232150.54NLoq4m031144@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=26064d3e74639fbaa5b2b1cef7ea9c344db4caeb commit 26064d3e74639fbaa5b2b1cef7ea9c344db4caeb Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-05-15 13:36:48 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-05-23 21:50:38 +0000 Makefile.inc1: Remove unused non-NO_ROOT support As of commit 41adc5f29ba6 ("release: Always use NO_ROOT for distribute* and package*") this packagekernel code path is never used, so remove it. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50361 --- Makefile.inc1 | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ebba0ccd9f5e..60010da6ad50 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1938,7 +1938,6 @@ distributekernel distributekernel.debug: .PHONY .endif packagekernel: .PHONY -.if defined(NO_ROOT) .if !defined(NO_INSTALLKERNEL) cd ${DESTDIR}/${DISTDIR}/kernel; \ ${TAR_CMD} cvf - --exclude '*.debug' \ @@ -1965,30 +1964,6 @@ packagekernel: .PHONY .endif .endfor .endif -.else -.if !defined(NO_INSTALLKERNEL) - cd ${DESTDIR}/${DISTDIR}/kernel; \ - ${TAR_CMD} cvf - --exclude '*.debug' . | \ - ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz -.endif -.if ${MK_DEBUG_FILES} != "no" - cd ${DESTDIR}/${DISTDIR}/kernel; \ - ${TAR_CMD} cvf - --include '*/*/*.debug' $$(eval find .) | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz -.endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} - cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - ${TAR_CMD} cvf - --exclude '*.debug' . | \ - ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz -.if ${MK_DEBUG_FILES} != "no" - cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - ${TAR_CMD} cvf - --include '*/*/*.debug' $$(eval find .) | \ - ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz -.endif -.endfor -.endif -.endif stagekernel: .PHONY ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} DISTDIR=. distributekernel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505232150.54NLoq4m031144>