Date: Sun, 5 Jan 2025 00:16:50 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: 0f7d8b71b45b - main - Makefile.inc1: Set DISTDIR in stagekernel target Message-ID: <202501050016.5050Gost012073@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=0f7d8b71b45b0a86b25e1005e83140ee6cbdff45 commit 0f7d8b71b45b0a86b25e1005e83140ee6cbdff45 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-01-02 02:26:00 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-01-05 00:16:38 +0000 Makefile.inc1: Set DISTDIR in stagekernel target The distributekernel target expects DESTDIR and DISTDIR to be set. The stagekernel target invokes `make distributekernel`, and previously left DISTDIR unset, resulting in a path with a "//" component. Instead, set DISTDIR to . to make the way we're (ab)using the distributekernel target more explicit. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48288 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5c3d190e4c3e..bad747a0e551 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1991,7 +1991,7 @@ packagekernel: .PHONY .endif stagekernel: .PHONY - ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel + ${_+_}${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} DISTDIR=. distributekernel PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501050016.5050Gost012073>