Date: Wed, 2 Dec 2020 09:21:51 -0600 From: Kyle Evans <kevans@freebsd.org> To: Ryan Moeller <freqlabs@freebsd.org> Cc: ports-committers <ports-committers@freebsd.org>, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r556828 - in head/sysutils: openzfs openzfs-kmod Message-ID: <CACNAnaFYY0E7K4EUqEQmZxvDCEzrG6WLarCKbyA7iggxE-ah8Q@mail.gmail.com> In-Reply-To: <202012021454.0B2EshrA025784@repo.freebsd.org> References: <202012021454.0B2EshrA025784@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Dec 2, 2020 at 8:54 AM Ryan Moeller <freqlabs@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaFYY0E7K4EUqEQmZxvDCEzrG6WLarCKbyA7iggxE-ah8Q>