svn commit: r556828 - in head/sysutils: openzfs openzfs-kmod

[Kyle Evans]

On Wed, Dec 2, 2020 at 8:54 AM Ryan Moeller <freqlabs at freebsd.org> wrote:
>
> Author: freqlabs (src committer)
> Date: Wed Dec  2 14:54:43 2020
> New Revision: 556828
> URL: https://svnweb.freebsd.org/changeset/ports/556828
>
> Log:
>   sysutils/openzfs*: Bump, fix kmod on 13-CURRENT
>
>   When the kernel is built with INVARIANTS we also need to build ZFS
>   with INVARIANTS.  Additionally, the knob for this has been broken out
>   from WITH_DEBUG=true to WITH_INVARIANTS=true in the OpenZFS build
>   system.  We add an INVARIANTS option to the port for this, and enable
>   the DEBUG and INVARIANTS options by default on 13-CURRENT to ensure
>   that a default configuration builds openzfs-kmod with the correct
>   options.
>
>   Users building their 13-CURRENT kernel without INVARIANTS will need to
>   disable the INVARIANTS option in the port manually.  I'm not aware of a
>   better way to implement this decision at the moment.
>

FWIW, I think this is the most correct path given the constraints at
the moment. A more accurate approach could be pushing the logic
instead into ^/sys/conf/config.mk because we /probably/ should be
setting INVARIANTS for untied module builds on -CURRENT, then you can
just include that and check KERN_OPTS to set a default
WITH_INVARIANTS knob more appropriately.

It would be just one more thing that re@ needs to axe when a new
branch is spawned, but I think we've removed one or two other
locations that they needed to touch so the net effect may still be
less than when stable/12 branched. :-)

Thanks,

Kyle Evans