Permalink
Browse files

MK_ZFS -> {MK_ZFS|MK_LOADER_ZFS}, this is so we can diable userland /…

… kernel

ZFS but keep the boot-loaders when using ZoL port.

MFC after: 1 week
Reviewed by: rgrimes
Differential Revision: https://reviews.freebsd.org/D18739
  • Loading branch information...
mattmacy committed Jan 5, 2019
1 parent 87678f9 commit 139c85ce53a6bbd94e1ab1b92b2014e32d9e23e8
@@ -3,3 +3,4 @@
*.cpp diff=cpp
*.hpp diff=cpp
*.py diff=python
. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS
@@ -191,6 +191,7 @@ __DEFAULT_YES_OPTIONS = \
WIRELESS \
WPA_SUPPLICANT_EAPOL \
ZFS \
LOADER_ZFS \
ZONEINFO

__DEFAULT_NO_OPTIONS = \
@@ -451,6 +452,7 @@ MK_SOURCELESS_UCODE:= no

.if ${MK_CDDL} == "no"
MK_ZFS:= no
MK_LOADER_ZFS:= no
MK_CTF:= no
.endif

@@ -25,7 +25,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-function

# 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
@@ -44,7 +44,7 @@ CFLAGS+= -fPIC -mno-red-zone
.endif
CFLAGS+= -I${EFIINC}
CFLAGS+= -I${EFIINCMD}
.if ${MK_ZFS} != "no"
.if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT
.endif
@@ -26,7 +26,7 @@ SRCS= autoload.c \
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
@@ -20,6 +20,6 @@ SUBDIR.yes+= pxeldr
SUBDIR.yes+= kgzldr
.endif

SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot
SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot

.include <bsd.subdir.mk>
@@ -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}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
${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}
@@ -165,7 +165,7 @@ SRCS+= explicit_bzero.c crc32_libkern.c
.endif

# Maybe ZFS
.if ${MK_ZFS} == "yes"
.if ${MK_LOADER_ZFS} == "yes"
.include "${SASRC}/zfs/Makefile.inc"
.endif

@@ -5,6 +5,6 @@ NO_OBJ=t
.include <bsd.init.mk>

SUBDIR.yes= boot1 loader
SUBDIR.${MK_ZFS}+=zfsboot
SUBDIR.${MK_LOADER_ZFS}+=zfsboot

.include <bsd.subdir.mk>
@@ -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 @@ NEWVERSWHAT?= "bootstrap loader" sparc64
VERSION_FILE= ${.CURDIR}/../loader/version
INSTALLFLAGS= -b

.if ${MK_ZFS} != "no"
.if ${MK_LOADER_ZFS} != "no"
HAVE_ZFS= yes
.endif

@@ -42,7 +42,7 @@ HELP_FILES= ${.CURDIR}/help.sparc64

LDFLAGS+= -static

.if ${MK_ZFS} == "yes"
.if ${MK_LOADER_ZFS} == "yes"
LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader
.endif

@@ -45,7 +45,7 @@ VERSION_FILE= ${.CURDIR}/../userboot/version
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
@@ -0,0 +1,2 @@
.\" $FreeBSD$
Set to not build ZFS file system boot loader support.
@@ -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.

0 comments on commit 139c85c

Please sign in to comment.