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
This commit is contained in:
Warner Losh
2025-11-24 17:35:19 -07:00
parent a303b1455f
commit 05346243df
2 changed files with 10 additions and 11 deletions
+2 -3
View File
@@ -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
+8 -8
View File
@@ -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