aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/lib/libzdb/Makefile1
-rw-r--r--cddl/lib/libzfs_core/Makefile1
-rw-r--r--cddl/lib/libzfsbootenv/Makefile1
-rw-r--r--cddl/lib/libzpool/Makefile18
-rw-r--r--cddl/lib/libzutil/Makefile1
-rw-r--r--cddl/lib/pam_zfs_key/Makefile1
-rw-r--r--cddl/share/zfs/compatibility.d/Makefile12
7 files changed, 26 insertions, 9 deletions
diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
index 63248399b91c..0eb30c55d107 100644
--- a/cddl/lib/libzdb/Makefile
+++ b/cddl/lib/libzdb/Makefile
@@ -14,6 +14,7 @@ CSTD= c99
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index 4cd978e99a7d..d986c45725b3 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -20,6 +20,7 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
index 5f5dbfb6f108..15ee5bfaeaa4 100644
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -21,6 +21,7 @@ CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index b80486484506..4c8285eedb2d 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -14,8 +14,6 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/module/zstd/lib/compress
.PATH: ${ZFSTOP}/module/zstd/lib/decompress
-.PATH: ${ZFSTOP}/module/os/linux/zfs
-
.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
@@ -34,12 +32,16 @@ PACKAGE= zfs
LIB= zpool
USER_C = \
- abd_os.c \
+ arc_os.c \
kernel.c \
taskq.c \
- util.c
+ util.c \
+ zfs_debug.c
+
+.PATH: ${ZFSTOP}/module/os/linux/zfs
KERNEL_C = \
+ simd_stat.c \
zfeature_common.c \
zfs_comutil.c \
zfs_deleg.c \
@@ -52,9 +54,9 @@ KERNEL_C = \
zpool_prop.c \
zprop_common.c \
abd.c \
+ abd_os.c \
aggsum.c \
arc.c \
- arc_os.c \
blake3_zfs.c \
blkptr.c \
bplist.c \
@@ -72,6 +74,7 @@ KERNEL_C = \
ddt_zap.c \
dmu.c \
dmu_diff.c \
+ dmu_direct.c \
dmu_object.c \
dmu_objset.c \
dmu_recv.c \
@@ -172,7 +175,6 @@ KERNEL_C = \
zfeature.c \
zfs_byteswap.c \
zfs_chksum.c \
- zfs_debug.c \
zfs_fm.c \
zfs_fuid.c \
zfs_sa.c \
@@ -248,7 +250,8 @@ LUA_C = \
UNICODE_C = u8_textprep.c uconv.c
-SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C}
+SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C}
+
WARNS?= 2
CFLAGS+= \
@@ -261,6 +264,7 @@ CFLAGS+= \
-I${ZFSTOP}/include/os/freebsd/zfs \
-I${SRCTOP}/cddl/compat/opensolaris/include \
-I${ZFSTOP}/module/icp/include \
+ -I${SRCTOP}/compat/linuxkpi/common/include/linux \
-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index 4d9794c32dda..d1a943b25005 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -28,6 +28,7 @@ CSTD= c99
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile
index c35a8a6bd615..4d3b41bf3ad0 100644
--- a/cddl/lib/pam_zfs_key/Makefile
+++ b/cddl/lib/pam_zfs_key/Makefile
@@ -16,6 +16,7 @@ CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
+CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile
index 5b30adf4863a..6cdb64b0fccb 100644
--- a/cddl/share/zfs/compatibility.d/Makefile
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@ -13,7 +13,8 @@ FILES= \
freebsd-11.2 \
freebsd-11.3 \
freenas-9.10.2 \
- grub2 \
+ grub2-2.06 \
+ grub2-2.12 \
openzfsonosx-1.7.0 \
openzfsonosx-1.8.1 \
openzfsonosx-1.9.3 \
@@ -22,6 +23,7 @@ FILES= \
openzfs-2.1-freebsd \
openzfs-2.1-linux \
openzfs-2.2 \
+ openzfs-2.3 \
zol-0.6.1 \
zol-0.6.4 \
zol-0.6.5 \
@@ -46,13 +48,19 @@ LINKS= \
${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.4 \
${FILESDIR}/freebsd-11.3 ${FILESDIR}/freenas-11.3 \
${FILESDIR}/freenas-11.0 ${FILESDIR}/freenas-11.1 \
+ ${FILESDIR}/grub2-2.12 ${FILESDIR}/grub2 \
${FILESDIR}/openzfsonosx-1.9.3 ${FILESDIR}/openzfsonosx-1.9.4 \
${FILESDIR}/openzfs-2.0-freebsd ${FILESDIR}/truenas-12.0 \
+ ${FILESDIR}/openzfs-2.1-freebsd ${FILESDIR}/freebsd-13.0 \
+ ${FILESDIR}/openzfs-2.1-freebsd ${FILESDIR}/freebsd-13.1 \
+ ${FILESDIR}/openzfs-2.1-freebsd ${FILESDIR}/freebsd-13.2 \
${FILESDIR}/zol-0.7 ${FILESDIR}/ubuntu-18.04 \
${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 \
${FILESDIR}/openzfs-2.1-linux ${FILESDIR}/ubuntu-22.04 \
${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \
- ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd
+ ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd \
+ ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-linux \
+ ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd
LINKMODE= ${NOBINMODE}
generated by cgit v1.3 (git 2.53.0) at 2026-08-18 23:10:05 +0000