From owner-dev-commits-src-all@freebsd.org Wed Mar 10 09:36:45 2021 Return-Path: Delivered-To: dev-commits-src-all@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 D9BE05AAD8E; Wed, 10 Mar 2021 09:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DwRmY4TnHz4lXj; Wed, 10 Mar 2021 09:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F278518A; Wed, 10 Mar 2021 09:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12A9ajJH014038; Wed, 10 Mar 2021 09:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12A9ajh0014037; Wed, 10 Mar 2021 09:36:45 GMT (envelope-from git) Date: Wed, 10 Mar 2021 09:36:45 GMT Message-Id: <202103100936.12A9ajh0014037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: e295b9d9f598 - stable/13 - zfs: bump version and install new share files MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e295b9d9f598e08598725e9352140f03f4163129 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Mar 2021 09:36:46 -0000 The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e295b9d9f598e08598725e9352140f03f4163129 commit e295b9d9f598e08598725e9352140f03f4163129 Author: Martin Matuska AuthorDate: 2021-02-18 11:08:20 +0000 Commit: Martin Matuska CommitDate: 2021-03-10 01:26:35 +0000 zfs: bump version and install new share files - bump version to 2.0.0-FreeBSD_gbf156c966 - install definition files for the new "-o compatibility" option to "zpool create" MFC after: 2 weeks (cherry picked from commit 10f57cb98fd61b2669640a84aa73ad118601f281) --- cddl/Makefile | 2 +- cddl/lib/libzfs/Makefile | 2 ++ cddl/sbin/zpool/Makefile | 3 ++- cddl/share/Makefile | 13 +++++++++++++ cddl/share/zfs/Makefile | 9 +++++++++ cddl/share/zfs/compatibility.d/Makefile | 28 ++++++++++++++++++++++++++++ etc/mtree/BSD.root.dist | 2 ++ etc/mtree/BSD.usr.dist | 4 ++++ sys/modules/zfs/zfs_config.h | 4 ++-- 9 files changed, 63 insertions(+), 4 deletions(-) diff --git a/cddl/Makefile b/cddl/Makefile index d01199b5d9af..7b9d13146afa 100644 --- a/cddl/Makefile +++ b/cddl/Makefile @@ -3,7 +3,7 @@ .include SUBDIR= lib .WAIT \ - sbin usr.bin usr.sbin + sbin share usr.bin usr.sbin SUBDIR.${MK_TESTS}+= tests diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index d0b3458eda64..b159955c0212 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -103,6 +103,8 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS+= -DSYSCONFDIR=\"/etc\" +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" .include diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index fbde6beec331..43cc8f2997b7 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -71,7 +71,8 @@ CFLAGS+= \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ - -DSYSCONFDIR=\"/etc\" + -DSYSCONFDIR=\"/etc\" \ + -DPKGDATADIR=\"/usr/share/zfs\" LIBADD= geom nvpair uutil zfs zutil avl spl tpool zfs_core m LDADD+= -pthread diff --git a/cddl/share/Makefile b/cddl/share/Makefile new file mode 100644 index 000000000000..68670ffbe7e0 --- /dev/null +++ b/cddl/share/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +.include + +SUBDIR= ${_zfs} + +.if ${MK_ZFS} != "no" +_zfs= zfs +.endif + +SUBDIR_PARALLEL= + +.include diff --git a/cddl/share/zfs/Makefile b/cddl/share/zfs/Makefile new file mode 100644 index 000000000000..98e10b60aae6 --- /dev/null +++ b/cddl/share/zfs/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.include + +SUBDIR= compatibility.d + +SUBDIR_PARALLEL= + +.include diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile new file mode 100644 index 000000000000..6531430ef050 --- /dev/null +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d + +FILES= \ + compat-2018 \ + compat-2019 \ + compat-2020 \ + compat-2021 \ + freebsd-11.0 \ + freebsd-11.2 \ + freebsd-11.3 \ + freenas-9.10.2 \ + grub2 \ + openzfsonosx-1.7.0 \ + openzfsonosx-1.8.1 \ + openzfsonosx-1.9.3 \ + openzfs-2.0-freebsd \ + openzfs-2.0-linux \ + zol-0.6.5 \ + zol-0.7 \ + zol-0.8 + +FILESDIR= ${SHAREDIR}/zfs/compatibility.d + +.include diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 2cfa18dd5662..f734f7891429 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -95,6 +95,8 @@ syslog.d .. zfs + compatibility.d + .. .. .. lib diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 375cf3a96447..9ae3acbe6eba 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1230,6 +1230,10 @@ keymaps .. .. + zfs + compatibility.d + .. + .. zoneinfo Africa .. diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 73a56f9291c6..18ca44d1b3c1 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -734,7 +734,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.0.0-FreeBSD_g436ab35a5" +#define ZFS_META_ALIAS "zfs-2.0.0-FreeBSD_gbf156c966" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -764,7 +764,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g436ab35a5" +#define ZFS_META_RELEASE "FreeBSD_gbf156c966" /* Define the project version. */ #define ZFS_META_VERSION "2.0.0"