From owner-svn-ports-head@freebsd.org Wed Dec 2 15:22:05 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E86247DB69; Wed, 2 Dec 2020 15:22:05 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CmN4F2GNTz4v8d; Wed, 2 Dec 2020 15:22:05 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 40201257A1; Wed, 2 Dec 2020 15:22:05 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f181.google.com with SMTP id y18so1495744qki.11; Wed, 02 Dec 2020 07:22:05 -0800 (PST) X-Gm-Message-State: AOAM532j2g8OTyr5ozT3w9jzoYWADihq2iTWCuu9O7F2g+S5HiOqLP/e JnRzoRVTnh2en0O7aSMLHw+nE45QMqkHhpyAVH0= X-Google-Smtp-Source: ABdhPJyS0hC6W795nnMjIQgGbKa+3C84I8XKKKja18sq0eRneekytKxc/oObiSf7InvqvQXAfULHC1rIO0rDR3n1mmo= X-Received: by 2002:ae9:e00e:: with SMTP id m14mr3087203qkk.34.1606922524797; Wed, 02 Dec 2020 07:22:04 -0800 (PST) MIME-Version: 1.0 References: <202012021454.0B2EshrA025784@repo.freebsd.org> In-Reply-To: <202012021454.0B2EshrA025784@repo.freebsd.org> From: Kyle Evans Date: Wed, 2 Dec 2020 09:21:51 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r556828 - in head/sysutils: openzfs openzfs-kmod To: Ryan Moeller Cc: ports-committers , svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2020 15:22:05 -0000 On Wed, Dec 2, 2020 at 8:54 AM Ryan Moeller 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