d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: bump version and install new share files

Browse Source 
- bump version to 2.0.0-FreeBSD_gbf156c966
- install definition files for the new "-o compatibility" option
  to "zpool create"

MFC after:	2 weeks
This commit is contained in:
Martin Matuska 2021-02-18 12:08:20 +01:00
parent ee36e25a86
commit 10f57cb98f
9 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/Makefile
View File

@ -3,7 +3,7 @@
.include <src.opts.mk>
SUBDIR= lib .WAIT \
sbin usr.bin usr.sbin
sbin share usr.bin usr.sbin
SUBDIR.${MK_TESTS}+= tests

2
cddl/lib/libzfs/Makefile
View File

@ -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 <bsd.lib.mk>

3
cddl/sbin/zpool/Makefile
View File

@ -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

13
cddl/share/Makefile Normal file
View File

@ -0,0 +1,13 @@
# $FreeBSD$
.include <src.opts.mk>
SUBDIR= ${_zfs}
.if ${MK_ZFS} != "no"
_zfs= zfs
.endif
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>

9
cddl/share/zfs/Makefile Normal file
View File

@ -0,0 +1,9 @@
# $FreeBSD$
.include <src.opts.mk>
SUBDIR= compatibility.d
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>

28
cddl/share/zfs/compatibility.d/Makefile Normal file
View File

@ -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 <bsd.prog.mk>

2
etc/mtree/BSD.root.dist
View File

@ -95,6 +95,8 @@
syslog.d
..
zfs
compatibility.d
..
..
..
lib

4
etc/mtree/BSD.usr.dist
View File

@ -1230,6 +1230,10 @@
keymaps
..
..
zfs
compatibility.d
..
..
zoneinfo
Africa
..

4
sys/modules/zfs/zfs_config.h
View File

@ -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"