mirror of
https://git.freebsd.org/src.git
synced 2026-01-11 19:57:22 +00:00
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
This commit is contained in:
parent
05346243df
commit
3c857567c1
8 changed files with 10 additions and 10 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue