Page MenuHomeFreeBSD
Files F157478763

D18739.id52597.diff
No OneTemporary
Actions

D18739.id52597.diff
View Options

Index: head/.gitattributes
===================================================================
--- head/.gitattributes
+++ head/.gitattributes
@@ -3,3 +3,4 @@
*.cpp diff=cpp
*.hpp diff=cpp
*.py diff=python
+. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -191,6 +191,7 @@
WIRELESS \
WPA_SUPPLICANT_EAPOL \
ZFS \
+ LOADER_ZFS \
ZONEINFO
__DEFAULT_NO_OPTIONS = \
@@ -451,6 +452,7 @@
.if ${MK_CDDL} == "no"
MK_ZFS:= no
+MK_LOADER_ZFS:= no
MK_CTF:= no
.endif
Index: head/stand/efi/boot1/Makefile
===================================================================
--- head/stand/efi/boot1/Makefile
+++ head/stand/efi/boot1/Makefile
@@ -25,7 +25,7 @@
# architecture-specific loader code
SRCS= boot1.c self_reloc.c start.S ufs_module.c
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
SRCS+= zfs_module.c
CFLAGS.zfs_module.c+= -I${ZFSSRC}
CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs
Index: head/stand/efi/libefi/Makefile
===================================================================
--- head/stand/efi/libefi/Makefile
+++ head/stand/efi/libefi/Makefile
@@ -44,7 +44,7 @@
.endif
CFLAGS+= -I${EFIINC}
CFLAGS+= -I${EFIINCMD}
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT
.endif
Index: head/stand/efi/loader/Makefile
===================================================================
--- head/stand/efi/loader/Makefile
+++ head/stand/efi/loader/Makefile
@@ -26,7 +26,7 @@
vers.c
CFLAGS+= -I${.CURDIR}/../loader
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT
HAVE_ZFS= yes
Index: head/stand/i386/Makefile
===================================================================
--- head/stand/i386/Makefile
+++ head/stand/i386/Makefile
@@ -20,6 +20,6 @@
SUBDIR.yes+= kgzldr
.endif
-SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot
+SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot
.include <bsd.subdir.mk>
Index: head/stand/i386/loader/Makefile
===================================================================
--- head/stand/i386/loader/Makefile
+++ head/stand/i386/loader/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-HAVE_ZFS= ${MK_ZFS}
+HAVE_ZFS= ${MK_LOADER_ZFS}
LOADER_NET_SUPPORT?= yes
LOADER_NFS_SUPPORT?= yes
@@ -64,7 +64,7 @@
${LOADER}.bin: ${LOADER}.sym
strip -R .comment -R .note -o ${.TARGET} ${.ALLSRC}
-.if ${MK_ZFS} == "yes" && ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}
+.if ${MK_LOADER_ZFS} == "yes" && ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}
LINKS+= ${BINDIR}/${LOADER} ${BINDIR}/zfsloader
.endif
.if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}
Index: head/stand/libsa/Makefile
===================================================================
--- head/stand/libsa/Makefile
+++ head/stand/libsa/Makefile
@@ -165,7 +165,7 @@
.endif
# Maybe ZFS
-.if ${MK_ZFS} == "yes"
+.if ${MK_LOADER_ZFS} == "yes"
.include "${SASRC}/zfs/Makefile.inc"
.endif
Index: head/stand/sparc64/Makefile
===================================================================
--- head/stand/sparc64/Makefile
+++ head/stand/sparc64/Makefile
@@ -5,6 +5,6 @@
.include <bsd.init.mk>
SUBDIR.yes= boot1 loader
-SUBDIR.${MK_ZFS}+=zfsboot
+SUBDIR.${MK_LOADER_ZFS}+=zfsboot
.include <bsd.subdir.mk>
Index: head/stand/sparc64/loader/Makefile
===================================================================
--- head/stand/sparc64/loader/Makefile
+++ head/stand/sparc64/loader/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-HAVE_ZFS= ${MK_ZFS}
+HAVE_ZFS= ${MK_LOADER_ZFS}
LOADER_DISK_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
@@ -21,7 +21,7 @@
VERSION_FILE= ${.CURDIR}/../loader/version
INSTALLFLAGS= -b
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
HAVE_ZFS= yes
.endif
@@ -42,7 +42,7 @@
LDFLAGS+= -static
-.if ${MK_ZFS} == "yes"
+.if ${MK_LOADER_ZFS} == "yes"
LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader
.endif
Index: head/stand/userboot/userboot/Makefile
===================================================================
--- head/stand/userboot/userboot/Makefile
+++ head/stand/userboot/userboot/Makefile
@@ -45,7 +45,7 @@
LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so
.endif
-.if ${MK_ZFS} != "no"
+.if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -DUSERBOOT_ZFS_SUPPORT
HAVE_ZFS=yes
.endif
Index: head/tools/build/options/WITHOUT_LOADER_ZFS
===================================================================
--- head/tools/build/options/WITHOUT_LOADER_ZFS
+++ head/tools/build/options/WITHOUT_LOADER_ZFS
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build ZFS file system boot loader support.
Index: head/tools/build/options/WITHOUT_ZFS
===================================================================
--- head/tools/build/options/WITHOUT_ZFS
+++ head/tools/build/options/WITHOUT_ZFS
@@ -1,2 +1,2 @@
.\" $FreeBSD$
-Set to not build ZFS file system.
+Set to not build ZFS file system kernel module, libraries, and user commands.

File Metadata

Mime Type
text/plain
Expires
Fri, May 22, 9:56 PM (20 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33431991
Default Alt Text
D18739.id52597.diff (5 KB)

Event Timeline