From nobody Thu May 21 14:22:56 2026 X-Original-To: dev-commits-src-main@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 4gLrGm4cDHz6f74Z for ; Thu, 21 May 2026 14:22:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gLrGm40ZQz3Khs for ; Thu, 21 May 2026 14:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779373376; 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=bIK+LP1ht9XSoEV0O3I64I9YkV7zRA2XFI7F7VEGzGY=; b=M15Pp0KlrujfrsrKe08xIArTCdlqvxVVasL8AT9YHujM4YkVys4Z7sCpWj/RgUQYPAd6SJ dpiQlEEAz8ko2KAmIb3wX4lGORqCh8WIG8qMKostVED75GgtqL0MGBj91H1OTK5C2+rUB7 XIV10uggJb+KSDevKX+kuw3UGSgUy2xXpE+kRtbOQerUWnwb1F7wgZQ7SVMhXll5vofIcE 0O9NBOc/Q6aDhmVHwXmcUzJynv64oPd/gp7nQDz7/HOKPkNLUKkha9dDS5xADwG9yQYulF WYYNN425rde7qT2UKCPh0+lDwlDkplEOrbUWiJF+qUJTRPPXpS0shyqvXvlVog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779373376; a=rsa-sha256; cv=none; b=ItpLS9ccONYZQL23nZjw4nnDKN4aP9PPOMRhDe9PeuWM+vLxGcZifyN3ogQGzzO6FtaMTc YzEQGE5snd/fN6b0dDz99MYsXk8SLZOk1/uhRjrrtcn/BpFHICYSncNPenOOL28n1zUE67 MJdEd12R/lklSeerfNOe60xhpw3gvsLcasnSlCPoK2rzQLGzVMX+qMXM5w+upGUUBPqC+E bdVe8oNDN5WwkMj3v+Lrt3zLvhWzRky2VZnkNDq0gKwURqsxHKJICoydRycXf8AqrSUjRv SsuiCbl3mYxcwS1v2D5o8dX4UsDfmV2H0KnWYiP5G5xwkMGaPKp9w3QicS5zzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779373376; 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=bIK+LP1ht9XSoEV0O3I64I9YkV7zRA2XFI7F7VEGzGY=; b=cDYV04qWMNbLuuaX1qEsWs0HdwPPTZoSHHZLt0n/IwY56OJXQZVACqSn+SealCogwx4U2W oEEdclPlNH/ZlTAxUTw54dUWauIhDA77F7tqsgyZmP1NB82b3+phMviKkjh/t85mCz7O3Q zB8Sv793rSkxnHWqw3JSp97Ec14Y5/s49e27waoPosZvuLFjcHCZ3ZhTp3hN/0JE7iFgrQ j7yxSf1SgwVYZFA0ouiLAU7zS8nCgyvxzB1rIKXzorAPS/S6bgbxCLoIiv1/lxJljrlgXl cFY3Z8qO5T6OZTbOhQNyTHePk1ww2bGZQs9dOao8oihodEHzNsUXSZSjj4Qtmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLrGm3cTQzcZm for ; Thu, 21 May 2026 14:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ff24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 14:22:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 02ef0b6d76e9 - main - universe: allow moving build logs to UNIVERSE_LOGDIR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02ef0b6d76e9717b8e3182dd706e23fd2702701d Auto-Submitted: auto-generated Date: Thu, 21 May 2026 14:22:56 +0000 Message-Id: <6a0f1540.3ff24.51dc4c5c@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=02ef0b6d76e9717b8e3182dd706e23fd2702701d commit 02ef0b6d76e9717b8e3182dd706e23fd2702701d Author: Siva Mahadevan AuthorDate: 2026-05-20 20:05:53 +0000 Commit: Siva Mahadevan CommitDate: 2026-05-21 14:16:48 +0000 universe: allow moving build logs to UNIVERSE_LOGDIR This allows `make universe` or `make tinderbox` to build from a read-only src tree. Reviewed by: ziaee, imp, delphij Approved by: lwhsu (mentor), emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55566 --- Makefile | 17 ++++++++--------- share/man/man7/build.7 | 7 ++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9308883b8500..e7a565cff05e 100644 --- a/Makefile +++ b/Makefile @@ -599,8 +599,9 @@ targets: .PHONY .endfor .endfor +UNIVERSE_LOGDIR?=${.CURDIR} .if defined(DOING_TINDERBOX) -FAILFILE=${.CURDIR}/_.tinderbox.failed +FAILFILE=${UNIVERSE_LOGDIR}/_.tinderbox.failed MAKEFAIL=tee -a ${FAILFILE} .else MAKEFAIL=cat @@ -612,9 +613,7 @@ universe_prologue: .PHONY @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.if defined(DOING_TINDERBOX) @rm -f ${FAILFILE} -.endif universe-toolchain: .PHONY universe_prologue @echo "--------------------------------------------------------------" @@ -630,9 +629,9 @@ universe-toolchain: .PHONY universe_prologue TOOLS_PREFIX_UNDEF= \ kernel-toolchain \ MK_LLVM_TARGET_ALL=yes \ - > _.${.TARGET} 2>&1 || \ + > ${UNIVERSE_LOGDIR}/_.${.TARGET} 2>&1 || \ (echo "${.TARGET} failed," \ - "check _.${.TARGET} for details" | \ + "check ${UNIVERSE_LOGDIR}/_.${.TARGET} for details" | \ ${MAKEFAIL}; false) @if [ ! -e "${HOST_OBJTOP}/tmp/usr/bin/cc" ]; then \ echo "Missing host compiler at ${HOST_OBJTOP}/tmp/usr/bin/cc?" >&2; \ @@ -716,9 +715,9 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE .PHONY TARGET=${target} \ TARGET_ARCH=${target_arch} \ ${MAKE_PARAMS_${target_arch}} \ - > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ + > ${UNIVERSE_LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \ - "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \ + "check ${UNIVERSE_LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \ ${MAKEFAIL})) @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" .endfor @@ -775,9 +774,9 @@ universe_kernconf_${TARGET}_${kernel}: .MAKE TARGET_ARCH=${TARGET_ARCH_${kernel}} \ ${MAKE_PARAMS_${TARGET_ARCH_${kernel}}} \ KERNCONF=${kernel} \ - > _.${TARGET}.${kernel} 2>&1 || \ + > ${UNIVERSE_LOGDIR}/_.${TARGET}.${kernel} 2>&1 || \ (echo "${TARGET} ${kernel} kernel failed," \ - "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL})) + "check ${UNIVERSE_LOGDIR}/_.${TARGET}.${kernel} for details"| ${MAKEFAIL})) @echo ">> ${TARGET}.${TARGET_ARCH_${kernel}} ${kernel} kernel completed on `LC_ALL=C date`" .endfor .for target_arch in ${TARGET_ARCHES_${TARGET}} diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index b9a781a9b5ab..23980875eaaa 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 28, 2026 +.Dd May 20, 2026 .Dt BUILD 7 .Os .Sh NAME @@ -958,6 +958,11 @@ Only build worlds for each supported architecture. Only build kernels for each supported architecture. .It Va WITHOUT_KERNELS Only build worlds for each supported architecture. +.It Va UNIVERSE_LOGDIR +Write all build logs to this directory for each supported architecture. +When invoking +.Cm tinderbox , +also write the summary of all failed targets to this directory. .It Va UNIVERSE_TARGET Execute the specified .Xr make 1