On 21 May 2026, at 15:22, Siva Mahadevan <[email protected]> wrote: > > The branch main has been updated by siva: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=02ef0b6d76e9717b8e3182dd706e23fd2702701d > > commit 02ef0b6d76e9717b8e3182dd706e23fd2702701d > Author: Siva Mahadevan <[email protected]> > AuthorDate: 2026-05-20 20:05:53 +0000 > Commit: Siva Mahadevan <[email protected]> > 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
Hm, I don’t see an explanation for this change? This seems like a separate thing, and changes behaviour even when UNIVERSE_LOGDIR isn’t set? I can see the argument for doing it, but I don’t see any justification for it, whether in the commit message or in the Phabricator review, and it really belonged in its own commit IMO if making the change. Jessica
