git: 3c857567c10f - main - stand: Rename ZFSSRC to SAZFSSRC to avoid confusion

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=3c857567c10f9e30c86133729532188f5c3664f0

commit 3c857567c10f9e30c86133729532188f5c3664f0
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-11-25 00:35:30 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-11-25 00:50:26 +0000

    stand: Rename ZFSSRC to SAZFSSRC to avoid confusion
    
    ZFSSRC is abiguous on its surface and too clos to ZFSTOP, so rename it
    to SAZFSSRC.
    
    Sponsored by:           Netflix
    Reviewed by:            tsoome
    Differential Revision:  https://reviews.freebsd.org/D53901
---
 stand/defs.mk                  | 2 +-
 stand/efi/boot1/Makefile       | 2 +-
 stand/efi/libefi/Makefile      | 2 +-
 stand/efi/loader/Makefile      | 2 +-
 stand/i386/gptzfsboot/Makefile | 4 ++--
 stand/kboot/kboot/Makefile     | 2 +-
 stand/libsa/zfs/Makefile.inc   | 4 ++--
 stand/loader.mk                | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/stand/defs.mk b/stand/defs.mk
index f6c43ef7bd01..504493ebe648 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -56,9 +56,9 @@ LIBLUASRC=	${BOOTSRC}/liblua
 LIBOFWSRC=	${BOOTSRC}/libofw
 LUASRC=		${SRCTOP}/contrib/lua/src
 SASRC=		${BOOTSRC}/libsa
+SAZFSSRC=	${SASRC}/zfs
 SYSDIR=		${SRCTOP}/sys
 UBOOTSRC=	${BOOTSRC}/uboot
-ZFSSRC=		${SASRC}/zfs
 ZFSOSSRC=	${ZFSTOP}/module/os/freebsd/
 ZFSOSINC=	${ZFSTOP}/include/os/freebsd
 LIBCSRC=	${SRCTOP}/lib/libc
diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
index c9f04546b56b..17fa849beb0b 100644
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -32,7 +32,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-function
 SRCS+=	boot1.c proto.c self_reloc.c start.S ufs_module.c
 .if ${MK_LOADER_ZFS} != "no"
 SRCS+=		zfs_module.c
-CFLAGS.zfs_module.c+=	-I${ZFSSRC}
+CFLAGS.zfs_module.c+=	-I${SAZFSSRC}
 CFLAGS.zfs_module.c+=	-I${SYSDIR}/cddl/boot/zfs
 CFLAGS.zfs_module.c+=	-I${SYSDIR}/crypto/skein
 CFLAGS.zfs_module.c+=	-I${SYSDIR}/contrib/openzfs/include
diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile
index aaf9ef666fde..4f4586fbf253 100644
--- a/stand/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
@@ -53,7 +53,7 @@ CFLAGS.efi_console.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite
 CFLAGS.efi_console.c+= -I${.CURDIR}/../loader
 CFLAGS.teken.c+= -I${SRCTOP}/sys/teken
 .if ${MK_LOADER_ZFS} != "no"
-CFLAGS+=	-I${ZFSSRC}
+CFLAGS+=	-I${SAZFSSRC}
 CFLAGS+=	-I${SYSDIR}/cddl/boot/zfs
 CFLAGS+=	-I${SYSDIR}/cddl/contrib/opensolaris/uts/common
 CFLAGS+=	-DEFI_ZFS_BOOT
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
index 8000e2f6df7d..addb7652249d 100644
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -36,7 +36,7 @@ CFLAGS+=	-I${EFISRC}/acpica/include
 
 CFLAGS+=	-I${.CURDIR}/../loader
 .if ${MK_LOADER_ZFS} != "no"
-CFLAGS+=	-I${ZFSSRC}
+CFLAGS+=	-I${SAZFSSRC}
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
 CFLAGS+=	-DEFI_ZFS_BOOT
diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile
index ebdd4958c5f2..2b3b5422031b 100644
--- a/stand/i386/gptzfsboot/Makefile
+++ b/stand/i386/gptzfsboot/Makefile
@@ -27,7 +27,7 @@ CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \
 	-I${LDRSRC} \
 	-I${BOOTSRC}/i386/common \
 	-I${BOOTSRC}/i386/libi386 \
-	-I${ZFSSRC} \
+	-I${SAZFSSRC} \
 	-I${SYSDIR}/crypto/skein \
 	-I${SYSDIR}/cddl/boot/zfs \
 	-I${SYSDIR}/contrib/openzfs/include \
@@ -77,6 +77,6 @@ gptzfsboot.bin: gptzfsboot.out
 gptzfsboot.out: ${BTXCRT} ${OBJS}
 	${LD} ${LD_FLAGS} --defsym ORG=${ORG2} -T ${LDSCRIPT} -o ${.TARGET} ${.ALLSRC} ${LIBI386} ${LIBSA32}
 
-zfsboot.o: ${ZFSSRC}/zfsimpl.c
+zfsboot.o: ${SAZFSSRC}/zfsimpl.c
 
 .include <bsd.prog.mk>
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index 19bae09df5ea..68bb67096851 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -32,7 +32,7 @@ SRCS+=		kbootfdt.c
 .endif
 
 .if ${MK_LOADER_ZFS} != "no"
-CFLAGS+=	-I${ZFSSRC}
+CFLAGS+=	-I${SAZFSSRC}
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
 HAVE_ZFS=yes
diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
index 5ecf68d3bc09..c747078a115b 100644
--- a/stand/libsa/zfs/Makefile.inc
+++ b/stand/libsa/zfs/Makefile.inc
@@ -1,4 +1,4 @@
-.PATH:		${ZFSSRC}
+.PATH:		${SAZFSSRC}
 .PATH:		${SYSDIR}/crypto/skein
 .PATH:		${ZFSOSSRC}/spl
 .PATH:		${ZFSTOP}/module/zstd
@@ -30,7 +30,7 @@ SRCS+=		${ZFS_SRC} ${ZSTD_SRC} ${ZFS_SRC_AS}
 # tweak something defined in that file.
 #
 
-ZFS_EARLY=	-I${ZFSSRC}/spl					\
+ZFS_EARLY=	-I${SAZFSSRC}/spl				\
 		-I${ZFSOSINC}					\
 		-I${ZFSOSINC}/spl				\
 		-I${ZFSOSINC}/zfs
diff --git a/stand/loader.mk b/stand/loader.mk
index e26ba1401912..496252e7a534 100644
--- a/stand/loader.mk
+++ b/stand/loader.mk
@@ -152,7 +152,7 @@ CFLAGS+= -DLOADER_MBR_SUPPORT
 
 .if ${HAVE_ZFS:Uno} == "yes"
 CFLAGS+=	-DLOADER_ZFS_SUPPORT
-CFLAGS+=	-I${ZFSSRC}
+CFLAGS+=	-I${SAZFSSRC}
 CFLAGS+=	-I${SYSDIR}/cddl/boot/zfs
 CFLAGS+=	-I${SYSDIR}/cddl/contrib/opensolaris/uts/common
 SRCS+=		zfs_cmd.c