diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-03-01 13:57:40 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-03-01 14:16:06 +0000 |
| commit | b9c2c366db1beb2ed276947056f45938ad8f57ec (patch) | |
| tree | afd52ba893942a3023b39bd092a3ffb0ade5ea7a /cddl | |
| parent | b9880e247b26c84a5800b7cba514a65843d55e2e (diff) | |
| parent | fb6d532066f23458f768a97ae94b158c42cbe484 (diff) | |
zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13
Notable upstream pull request merges:
#13976 3ad882658 Avoid calling rw_destroy() on uninitialized rwlock
#15243 11574a793 Add zfs_prepare_disk script for disk firmware install
#15331 e1bc32f71 Report ashift of L2ARC devices in zdb
#15675 12a031a3f spa: make read/write queues configurable
#15719 b4481996b spa: Fix FreeBSD sysctl handlers
#15719 8e5298f0a spa: Let spa_taskq_param_get()'s addition of a newline
be optional
#15769 dfece78a4 Add 'zpool status -e' flag to see unhealthy vdevs
#15847 d1ee3d611 LUA: Backport CVE-2020-24370's patch
Obtained from: OpenZFS
OpenZFS commit: fb6d532066f23458f768a97ae94b158c42cbe484
OpenZFS tag: zfs-2.1.15
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 2 | ||||
| -rw-r--r-- | cddl/usr.libexec/Makefile | 4 | ||||
| -rw-r--r-- | cddl/usr.libexec/zfs_prepare_disk/Makefile | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b33103a0c0c0..3ceee1f9aabd 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -104,6 +104,6 @@ CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS+= -DSYSCONFDIR=\"/etc\" CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" - +CFLAGS+= -DZFSEXECDIR=\"${LIBEXECDIR}/zfs\" .include <bsd.lib.mk> diff --git a/cddl/usr.libexec/Makefile b/cddl/usr.libexec/Makefile index b70b4966ffac..b47556264d77 100644 --- a/cddl/usr.libexec/Makefile +++ b/cddl/usr.libexec/Makefile @@ -1,10 +1,12 @@ .include <src.opts.mk> -SUBDIR= ${_zpool_influxdb} +SUBDIR= ${_zfs_prepare_disk} \ + ${_zpool_influxdb} .if ${MK_ZFS} != "no" _zpool_influxdb= zpool_influxdb +_zfs_prepare_disk= zfs_prepare_disk .endif SUBDIR_PARALLEL= diff --git a/cddl/usr.libexec/zfs_prepare_disk/Makefile b/cddl/usr.libexec/zfs_prepare_disk/Makefile new file mode 100644 index 000000000000..0efb4452829d --- /dev/null +++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile @@ -0,0 +1,19 @@ +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +.PATH: ${ZFSTOP}/scripts + +PACKAGE= zfs +SCRIPTS= zfs_prepare_disk +SCRIPTSDIR= ${LIBEXECDIR}/zfs + +.PATH: ${ZFSTOP}/man/man8 +MAN= zfs_prepare_disk.8 + +CLEANFILES+= zfs_prepare_disk.8 + +zfs_prepare_disk.8: zfs_prepare_disk.8.in + sed ${MAN_SUB} ${.ALLSRC} >${.TARGET} + +MAN_SUB+= -e 's|@zfsexecdir@|${LIBEXECDIR}/zfs|g' + +.include <bsd.prog.mk> |