git: 05346243dfa4 - main - stand: Move from OZFS to ZFSTOP

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=05346243dfa4ed85c4c3a31f2a32a861fd649c07

commit 05346243dfa4ed85c4c3a31f2a32a861fd649c07
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-11-25 00:35:19 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-11-25 00:35:46 +0000

    stand: Move from OZFS to ZFSTOP
    
    Use ZFSTOP instead of OZFS. They are the saame thing.
    
    Sponsored by:           Netflix
    Reviewed by:            tsoome
    Differential Revision:  https://reviews.freebsd.org/D53900
---
 stand/defs.mk                |  5 ++---
 stand/libsa/zfs/Makefile.inc | 16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/stand/defs.mk b/stand/defs.mk
index 54149f5f7b9e..f6c43ef7bd01 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -59,9 +59,8 @@ SASRC=		${BOOTSRC}/libsa
 SYSDIR=		${SRCTOP}/sys
 UBOOTSRC=	${BOOTSRC}/uboot
 ZFSSRC=		${SASRC}/zfs
-OZFS=		${SRCTOP}/sys/contrib/openzfs
-ZFSOSSRC=	${OZFS}/module/os/freebsd/
-ZFSOSINC=	${OZFS}/include/os/freebsd
+ZFSOSSRC=	${ZFSTOP}/module/os/freebsd/
+ZFSOSINC=	${ZFSTOP}/include/os/freebsd
 LIBCSRC=	${SRCTOP}/lib/libc
 
 BOOTOBJ=	${OBJTOP}/stand
diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
index 2e9d5679f71f..5ecf68d3bc09 100644
--- a/stand/libsa/zfs/Makefile.inc
+++ b/stand/libsa/zfs/Makefile.inc
@@ -1,12 +1,12 @@
 .PATH:		${ZFSSRC}
 .PATH:		${SYSDIR}/crypto/skein
 .PATH:		${ZFSOSSRC}/spl
-.PATH:		${OZFS}/module/zstd
-.PATH:		${OZFS}/module/zstd/lib/common
-.PATH:		${OZFS}/module/zstd/lib/compress
-.PATH:		${OZFS}/module/zstd/lib/decompress
-.PATH:		${OZFS}/module/icp/asm-aarch64/blake3
-.PATH:		${OZFS}/module/icp/algs/blake3
+.PATH:		${ZFSTOP}/module/zstd
+.PATH:		${ZFSTOP}/module/zstd/lib/common
+.PATH:		${ZFSTOP}/module/zstd/lib/compress
+.PATH:		${ZFSTOP}/module/zstd/lib/decompress
+.PATH:		${ZFSTOP}/module/icp/asm-aarch64/blake3
+.PATH:		${ZFSTOP}/module/icp/algs/blake3
 ZFS_SRC=	zfs.c nvlist.c skein.c skein_block.c list.c
 ZFS_SRC+=	zfs_zstd.c
 ZFS_SRC+=	blake3.c blake3_generic.c blake3_impl.c
@@ -41,7 +41,7 @@ ZFS_EARLY=	-I${ZFSSRC}/spl					\
 # from FreeBSD.
 #
 .for i in ${ZFS_SRC} ${ZSTD_SRC}
-CFLAGS.$i+=	-include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/include \
+CFLAGS.$i+=	-include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${ZFSTOP}/include \
 	-DNEED_SOLARIS_BOOLEAN
 .endfor
 
@@ -76,7 +76,7 @@ CFLAGS.$i+=	-U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 
 CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA
 
-CFLAGS.blake3_impl.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include -DIN_LIBSA
+CFLAGS.blake3_impl.c+= -I${ZFSTOP}/module/icp/algs/blake3 -I${ZFSTOP}/module/icp/include -DIN_LIBSA
 
 # Do not unroll skein loops, reduce code size
 CFLAGS.skein_block.c+=	-DSKEIN_LOOP=111