Date: Wed, 02 Dec 2020 16:37:32 +0100 From: Jan Beich <jbeich@FreeBSD.org> To: Kyle Evans <kevans@freebsd.org> Cc: Ryan Moeller <freqlabs@freebsd.org>, 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: <7dq0-z0ar-wny@FreeBSD.org> In-Reply-To: <CACNAnaFYY0E7K4EUqEQmZxvDCEzrG6WLarCKbyA7iggxE-ah8Q@mail.gmail.com> (Kyle Evans's message of "Wed, 2 Dec 2020 09:21:51 -0600") References: <202012021454.0B2EshrA025784@repo.freebsd.org> <CACNAnaFYY0E7K4EUqEQmZxvDCEzrG6WLarCKbyA7iggxE-ah8Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Kyle Evans <kevans@freebsd.org> writes: > 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. Why not drop "nooptions INVARIANT_SUPPORT" from GENERIC-NODEBUG? sys/conf/NOTES: # The INVARIANT_SUPPORT option makes us compile in support for # verifying some of the internal structures. It is a prerequisite for # 'INVARIANTS', as enabling 'INVARIANTS' will make these functions be # called. The intent is that you can set 'INVARIANTS' for single # source files (by changing the source file or specifying it on the # command line) if you have 'INVARIANT_SUPPORT' enabled. Also, if you # wish to build a kernel module with 'INVARIANTS', then adding # 'INVARIANT_SUPPORT' to your kernel will provide all the necessary # infrastructure without the added overhead. # options INVARIANT_SUPPORT
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7dq0-z0ar-wny>