From nobody Mon Dec 16 21:46:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBtmp51Wbz5gYpG; Mon, 16 Dec 2024 21:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBtmp33FSz41Pr; Mon, 16 Dec 2024 21:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734385578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czBjL8xwJanT0O4fzMvgpJey1xHG4uALY6j08e/JFlI=; b=G/R4NvTED4dEg8b2Yl+Hvwmf4CJuPybJeon57EDK7k6mRKN3BV9O3FN+d8zqi4yNQZjPAN zXwqzZ6HmmeO3eigzVaJuyqroFgHZ5REy06TEWuz9cCfw2XtksdV3t9WpCroHrfSz+4ZDy WOLwhGEm5i3Nted74CAao120dAOUBi2ptNGb0yQWV1zBgxz9NhntzHubtQ/3P13JRGpiGT cj7+WBNu7eILKJriKkuUw7waW/m5MFL72vgnz7KpfllMKnTpgX7WEdhzd8kcgN2saWyvsr KZki3aVD8KlHsyNGBrFcyXvQ7OPL00PhLmXB62i/vDw5dB2jgtBZXX4s18MrfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734385578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czBjL8xwJanT0O4fzMvgpJey1xHG4uALY6j08e/JFlI=; b=EwEp5reetApDi0jn99H0Hkt3SOIf4kixVP5ocWhVeTH/UVOBznUP9UA1Q2yaQhVBGWRbS4 wPEUwsgEIVmtGRsajKyY6KUJOsl8UgK5OP7f0mF3QUlPos3BE4OGxGeMUu/E9Sokz/WPIO WYZ+8dsd/S+M9seCvVdQKJyD/xupWqkh3mgNNiWlVO7VfxgaNxmBtxWunnUZdvlmPtig2+ 2RxpvXxm5+1m9+LAZOMuo2V++cF0CuUdlsawQOcogEOLAqxv7kNP7eyIO0SFPkAMMo+Syh KrF2C26d/GKF4IK9NBZymojb2N73QW5lnLG+eRGpMlb508Ji6MzZyC7kt9DgYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734385578; a=rsa-sha256; cv=none; b=GIIQjDz8MhMQZ0Frf9vT3t2vgsGP+h9T0TTOcU+pB8+VYsl+e1QsOJ4GxilAg0ysqDtftk cJ7XuO40U2z1qxCZvHS3CYtXJyqJZSSlAJZ7IhNaPCKwifT+ZiKeMuQKZEJUh6vGNOXN+e ZtpRqEsaUGtiB408Z76z9dzCpWrG6nTZ8TWF3BYZgJ8nU19jGFv5/ZhWOfaMRIv3gpaSv+ yMqFDdt4cwbOiLmPlxIXLaJmdj713Id2Bqzkj0VSEjzw+kRWn8jBjN2w9ARwb7TP2whi3J gPpnUQHYJzA+tFcyc2fx5DH5dJPVDTUvO0uKuTG5jLdgoBkz6x1fAQaooCCzKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YBtmp2XCQz19k2; Mon, 16 Dec 2024 21:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGLkIZl037953; Mon, 16 Dec 2024 21:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGLkIId037950; Mon, 16 Dec 2024 21:46:18 GMT (envelope-from git) Date: Mon, 16 Dec 2024 21:46:18 GMT Message-Id: <202412162146.4BGLkIId037950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 266f640b3896 - main - Makefile.inc1: Remove non-NO_ROOT cases from distributeworld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 266f640b38960653fcdbd1881e9dde0ce92a6c9d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=266f640b38960653fcdbd1881e9dde0ce92a6c9d commit 266f640b38960653fcdbd1881e9dde0ce92a6c9d Author: Ed Maste AuthorDate: 2024-12-11 16:25:34 +0000 Commit: Ed Maste CommitDate: 2024-12-16 21:29:59 +0000 Makefile.inc1: Remove non-NO_ROOT cases from distributeworld As of commit 41adc5f29ba6 ("release: Always use NO_ROOT for distribute* and package*") we pass -NO_ROOT for the release image artifact build targets. For distributeworld, add a check that NO_ROOT and METALOG are set, and then remove tests for them being set. This is an incremental step towards the goal of having all targets in release/Makefile run without requiring root. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48095 --- Makefile.inc1 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index bd0ed3ebfba8..8d47d8098ab8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1004,6 +1004,9 @@ IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .if ${DISTDIR:U/} == / .error DISTDIR must be set for make distributeworld and may not be the root directory. .endif +if !defined(NO_ROOT) || !defined(METALOG) +.error NO_ROOT and METALOG must be set for make distributeworld. +.endif CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR} CERTCTLFLAGS+= -d /base .else @@ -1501,7 +1504,6 @@ distributeworld installworld stageworld: _installcheck_world .PHONY -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null .endif .endif -.if defined(NO_ROOT) ${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ sed -e 's#^\./#./${dist}/#' >> ${METALOG} ${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \ @@ -1515,7 +1517,6 @@ distributeworld installworld stageworld: _installcheck_world .PHONY ${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist | \ sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} .endfor -.endif .endfor -mkdir ${DESTDIR}/${DISTDIR}/base ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH:Q} ${MAKE} \ @@ -1539,7 +1540,6 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .for dist in ${EXTRA_DISTRIBUTIONS} find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete .endfor -.if defined(NO_ROOT) .for dist in base ${EXTRA_DISTRIBUTIONS} .for path suffix in "" .meta /usr/lib/debug .debug.meta @# For each file that exists in this dist, print the corresponding @@ -1552,7 +1552,6 @@ distributeworld installworld stageworld: _installcheck_world .PHONY ${DESTDIR}/${DISTDIR}/${dist}${suffix} .endfor .endfor -.endif .endif # make(distributeworld) packageworld: .PHONY