Date: Wed, 2 Dec 2020 14:54:43 +0000 (UTC) From: Ryan Moeller <freqlabs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556828 - in head/sysutils: openzfs openzfs-kmod Message-ID: <202012021454.0B2EshrA025784@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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. Reviewed by: wg Approved by: wg (ports) Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D27442 Modified: head/sysutils/openzfs-kmod/Makefile head/sysutils/openzfs-kmod/distinfo head/sysutils/openzfs/Makefile head/sysutils/openzfs/distinfo head/sysutils/openzfs/pkg-plist Modified: head/sysutils/openzfs-kmod/Makefile ============================================================================== --- head/sysutils/openzfs-kmod/Makefile Wed Dec 2 14:39:20 2020 (r556827) +++ head/sysutils/openzfs-kmod/Makefile Wed Dec 2 14:54:43 2020 (r556828) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openzfs -PORTVERSION= 2020110200 +PORTVERSION= 2020120100 DISTVERSIONPREFIX= v CATEGORIES= sysutils PKGNAMESUFFIX?= -kmod @@ -17,26 +17,38 @@ USES= kmod USE_GITHUB= yes GH_ACCOUNT= openzfs GH_PROJECT= zfs -GH_TAGNAME= 8583540c6 +GH_TAGNAME= aa2778d10 KMODTARGET?= openzfs.ko PLIST_FILES= ${KMODDIR}/${KMODTARGET} -OPTIONS_DEFINE= DEBUG GCOV +OPTIONS_DEFINE= DEBUG INVARIANTS GCOV OPTIONS_SUB= yes + GCOV_DESC= Build kernel module with GCOV support (Requires gcc) +INVARIANTS_DESC= Build kernel module with INVARIANTS +INVARIANTS_IMPLIES= DEBUG + .include <bsd.port.pre.mk> .if (${OSVERSION} < 1200504) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013) IGNORE= needs FreeBSD 12/13 with AES-CCM support .endif +.if ${OSVERSION} >= 1300000 +OPTIONS_DEFAULT= DEBUG INVARIANTS +.endif + MAKE_OPTS+= SYSDIR=${SRC_BASE}/sys .if ${PORT_OPTIONS:MDEBUG} MAKE_OPTS+= WITH_DEBUG=true PLIST_FILES+= ${KMODDIR}/${KMODTARGET}.debug +.endif + +.if ${PORT_OPTIONS:MINVARIANTS} +MAKE_OPTS+= WITH_INVARIANTS=true .endif .if ${PORT_OPTIONS:MGCOV} Modified: head/sysutils/openzfs-kmod/distinfo ============================================================================== --- head/sysutils/openzfs-kmod/distinfo Wed Dec 2 14:39:20 2020 (r556827) +++ head/sysutils/openzfs-kmod/distinfo Wed Dec 2 14:54:43 2020 (r556828) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604335933 -SHA256 (openzfs-zfs-v2020110200-8583540c6_GH0.tar.gz) = 41b097e017ab6a9003291e1422769315ddf2ef510848819a37fd35713458c5e9 -SIZE (openzfs-zfs-v2020110200-8583540c6_GH0.tar.gz) = 9559144 +TIMESTAMP = 1606856053 +SHA256 (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = d32390f0628966b406774cacc1ecf271e285aef6c7dfa55fdc73800e7c624344 +SIZE (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = 31293387 Modified: head/sysutils/openzfs/Makefile ============================================================================== --- head/sysutils/openzfs/Makefile Wed Dec 2 14:39:20 2020 (r556827) +++ head/sysutils/openzfs/Makefile Wed Dec 2 14:54:43 2020 (r556828) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openzfs -PORTVERSION= 2020110200 +PORTVERSION= 2020120100 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -20,15 +20,14 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-config="user" OPTIONS_DEFINE= DEBUG PYTHON TESTS -DEBUG_DESC= Build a debug configuration -PYTHON_DESC= Build the pyzfs library, arc_summary and arcstat utilities +PYTHON_DESC= Build the pyzfs library, arc_summary, arcstat, and dbufstat utilities TESTS_DESC= Install the ZFS Test Suite OPTIONS_SUB= yes USE_GITHUB= yes GH_ACCOUNT= openzfs GH_PROJECT= zfs -GH_TAGNAME= 8583540c6 +GH_TAGNAME= aa2778d10 .include <bsd.port.pre.mk> Modified: head/sysutils/openzfs/distinfo ============================================================================== --- head/sysutils/openzfs/distinfo Wed Dec 2 14:39:20 2020 (r556827) +++ head/sysutils/openzfs/distinfo Wed Dec 2 14:54:43 2020 (r556828) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604336019 -SHA256 (openzfs-zfs-v2020110200-8583540c6_GH0.tar.gz) = 41b097e017ab6a9003291e1422769315ddf2ef510848819a37fd35713458c5e9 -SIZE (openzfs-zfs-v2020110200-8583540c6_GH0.tar.gz) = 9559144 +TIMESTAMP = 1606856244 +SHA256 (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = d32390f0628966b406774cacc1ecf271e285aef6c7dfa55fdc73800e7c624344 +SIZE (openzfs-zfs-v2020120100-aa2778d10_GH0.tar.gz) = 31293387 Modified: head/sysutils/openzfs/pkg-plist ============================================================================== --- head/sysutils/openzfs/pkg-plist Wed Dec 2 14:39:20 2020 (r556827) +++ head/sysutils/openzfs/pkg-plist Wed Dec 2 14:54:43 2020 (r556828) @@ -2,7 +2,6 @@ %%PYTHON%%bin/arcstat %%PYTHON%%bin/dbufstat %%TESTS%%bin/raidz_test -bin/zpool_influxdb etc/sudoers.d/zfs etc/zfs/vdev_id.conf.alias.example etc/zfs/vdev_id.conf.multipath.example @@ -229,6 +228,7 @@ include/libzfs/sys/unique.h include/libzfs/sys/uuid.h include/libzfs/sys/vdev.h include/libzfs/sys/vdev_disk.h +include/libzfs/sys/vdev_draid.h include/libzfs/sys/vdev_file.h include/libzfs/sys/vdev_impl.h include/libzfs/sys/vdev_indirect_births.h @@ -387,6 +387,7 @@ libexec/zfs/zpool.d/upath libexec/zfs/zpool.d/vendor libexec/zfs/zpool.d/w_proc libexec/zfs/zpool.d/w_ucor +libexec/zfs/zpool_influxdb man/man1/arcstat.1.gz %%TESTS%%man/man1/raidz_test.1.gz %%TESTS%%man/man1/test-runner.1.gz @@ -510,6 +511,7 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/bin/btree_test %%TESTS%%share/zfs/zfs-tests/bin/chg_usr_exec %%TESTS%%share/zfs/zfs-tests/bin/dir_rd_update +%%TESTS%%share/zfs/zfs-tests/bin/draid %%TESTS%%share/zfs/zfs-tests/bin/file_check %%TESTS%%share/zfs/zfs-tests/bin/file_trunc %%TESTS%%share/zfs/zfs-tests/bin/file_write @@ -744,6 +746,7 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/default.cfg %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/filetest_001_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/filetest_002_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/run_edonr_test.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/run_sha2_test.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/checksum/run_skein_test.ksh @@ -926,6 +929,8 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_012_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_013_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_014_neg.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh @@ -1175,6 +1180,7 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_readonly.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/draidcfg.gz %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.cfg %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib @@ -1202,6 +1208,10 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_023_neg.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_024_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_crypt_combos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_001_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_002_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_003_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_draid_004_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_encrypted.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_002_pos.ksh @@ -1287,6 +1297,8 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_014_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_015_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_016_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_017_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_all_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_encrypted.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_encrypted_load.ksh @@ -1966,6 +1978,8 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_001_neg.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_002_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_003_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/raidz_004_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/raidz/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted.cfg @@ -1991,10 +2005,17 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy.cfg %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy.kshlib -%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_001_pos.ksh -%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_002_pos.ksh -%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_003_pos.ksh -%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_004_neg.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid1.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid2.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid3.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare1.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare2.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_draid_spare3.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_mirror.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_raidz1.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_raidz2.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_raidz3.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/redundancy_stripe.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redundancy/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/refquota/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/refquota/refquota_001_pos.ksh @@ -2285,6 +2306,7 @@ share/pam-configs/zfs_key %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_003_pos.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/userquota/userspace_encrypted.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012021454.0B2EshrA025784>