Page MenuHomeFreeBSD

Centralize definition of ZFSTOP
ClosedPublic

Authored by jhb on Nov 17 2025, 5:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 27, 10:33 AM
Unknown Object (File)
Tue, Apr 21, 11:16 AM
Unknown Object (File)
Thu, Apr 16, 7:38 PM
Unknown Object (File)
Tue, Apr 14, 12:30 PM
Unknown Object (File)
Tue, Apr 14, 10:11 AM
Unknown Object (File)
Tue, Apr 14, 4:36 AM
Unknown Object (File)
Sun, Apr 12, 4:56 PM
Unknown Object (File)
Sat, Apr 11, 4:00 PM

Details

Summary

Define this helper variable in one place and make it available while
building the entire base system.

Obtained from: CheriBSD (mostly)

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jhb requested review of this revision.Nov 17 2025, 5:31 PM

In CheriBSD we have a second import of ZFS (with various CHERI patches applied) which is why we benefit from having a single definition of this variable, but I think the cleanup of using ZFSTOP more widely is nice regardless as it makes several long lines a bit shorter.

share/mk/src.sys.mk
51

@sjg Is this the right place to put a definition for a variable that is shared across the entire src tree?

Very happy to have the duplication removed

share/mk/src.sys.mk
51

It is certainly not unreasonable. There are potentially many makefiles included before this, if you want to allow any of those to provide an alternative, you might want to use ?= here.

Eg. in our trees at work (with site.*.mk) there are 29 makefiles read before src.sys.mk, even in upstream main, there are 17 makefiles read first.

share/mk/src.sys.mk
51

Hmm, I guess it can't hurt to use ?= here, but I didn't really envision this being something you would override. OTOH, perhaps using a local.*.mk downstream in CheriBSD would be nicer than a local diff that modifies this one line.

This revision is now accepted and ready to land.Nov 24 2025, 1:32 AM

The loader could use this in defs.mk

This revision was automatically updated to reflect the committed changes.