d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

MFC after: 1 week
Reviewed by: rgrimes
Differential Revision: https://reviews.freebsd.org/D18739
This commit is contained in:
Matt Macy 2019-01-05 22:45:20 +00:00
parent ac102a2a63
commit fbeb31a26b
13 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -3,3 +3,4 @@
*.cpp diff=cpp *.cpp diff=cpp
*.hpp diff=cpp *.hpp diff=cpp
*.py diff=python *.py diff=python
. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS

2
share/mk/src.opts.mk
View File

@ -191,6 +191,7 @@ __DEFAULT_YES_OPTIONS = \
WIRELESS \ WIRELESS \
WPA_SUPPLICANT_EAPOL \ WPA_SUPPLICANT_EAPOL \
ZFS \ ZFS \
LOADER_ZFS \
ZONEINFO ZONEINFO
__DEFAULT_NO_OPTIONS = \ __DEFAULT_NO_OPTIONS = \
@ -451,6 +452,7 @@ MK_SOURCELESS_UCODE:= no
.if ${MK_CDDL} == "no" .if ${MK_CDDL} == "no"
MK_ZFS:= no MK_ZFS:= no
MK_LOADER_ZFS:= no
MK_CTF:= no MK_CTF:= no
.endif .endif

2
stand/efi/boot1/Makefile
View File

@ -25,7 +25,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-function
# architecture-specific loader code # architecture-specific loader code
SRCS= boot1.c self_reloc.c start.S ufs_module.c SRCS= boot1.c self_reloc.c start.S ufs_module.c
.if ${MK_ZFS} != "no" .if ${MK_LOADER_ZFS} != "no"
SRCS+= zfs_module.c SRCS+= zfs_module.c
CFLAGS.zfs_module.c+= -I${ZFSSRC} CFLAGS.zfs_module.c+= -I${ZFSSRC}
CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs

2
stand/efi/libefi/Makefile
View File

@ -44,7 +44,7 @@ CFLAGS+= -fPIC -mno-red-zone
.endif .endif
CFLAGS+= -I${EFIINC} CFLAGS+= -I${EFIINC}
CFLAGS+= -I${EFIINCMD} CFLAGS+= -I${EFIINCMD}
.if ${MK_ZFS} != "no" .if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC} CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT CFLAGS+= -DEFI_ZFS_BOOT
.endif .endif

2
stand/efi/loader/Makefile
View File

@ -26,7 +26,7 @@ SRCS= autoload.c \
vers.c vers.c
CFLAGS+= -I${.CURDIR}/../loader CFLAGS+= -I${.CURDIR}/../loader
.if ${MK_ZFS} != "no" .if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -I${ZFSSRC} CFLAGS+= -I${ZFSSRC}
CFLAGS+= -DEFI_ZFS_BOOT CFLAGS+= -DEFI_ZFS_BOOT
HAVE_ZFS= yes HAVE_ZFS= yes

2
stand/i386/Makefile
View File

@ -20,6 +20,6 @@ SUBDIR.yes+= pxeldr
SUBDIR.yes+= kgzldr SUBDIR.yes+= kgzldr
.endif .endif
SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
stand/i386/loader/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
HAVE_ZFS= ${MK_ZFS} HAVE_ZFS= ${MK_LOADER_ZFS}
LOADER_NET_SUPPORT?= yes LOADER_NET_SUPPORT?= yes
LOADER_NFS_SUPPORT?= yes LOADER_NFS_SUPPORT?= yes
@ -64,7 +64,7 @@ ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
${LOADER}.bin: ${LOADER}.sym ${LOADER}.bin: ${LOADER}.sym
strip -R .comment -R .note -o ${.TARGET} ${.ALLSRC} 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 LINKS+= ${BINDIR}/${LOADER} ${BINDIR}/zfsloader
.endif .endif
.if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP} .if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP}

2
stand/libsa/Makefile
View File

@ -165,7 +165,7 @@ SRCS+= explicit_bzero.c crc32_libkern.c
.endif .endif
# Maybe ZFS # Maybe ZFS
.if ${MK_ZFS} == "yes" .if ${MK_LOADER_ZFS} == "yes"
.include "${SASRC}/zfs/Makefile.inc" .include "${SASRC}/zfs/Makefile.inc"
.endif .endif

2
stand/sparc64/Makefile
View File

@ -5,6 +5,6 @@ NO_OBJ=t
.include <bsd.init.mk> .include <bsd.init.mk>
SUBDIR.yes= boot1 loader SUBDIR.yes= boot1 loader
SUBDIR.${MK_ZFS}+=zfsboot SUBDIR.${MK_LOADER_ZFS}+=zfsboot
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

6
stand/sparc64/loader/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
HAVE_ZFS= ${MK_ZFS} HAVE_ZFS= ${MK_LOADER_ZFS}
LOADER_DISK_SUPPORT?= yes LOADER_DISK_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes
@ -21,7 +21,7 @@ NEWVERSWHAT?= "bootstrap loader" sparc64
VERSION_FILE= ${.CURDIR}/../loader/version VERSION_FILE= ${.CURDIR}/../loader/version
INSTALLFLAGS= -b INSTALLFLAGS= -b
.if ${MK_ZFS} != "no" .if ${MK_LOADER_ZFS} != "no"
HAVE_ZFS= yes HAVE_ZFS= yes
.endif .endif
@ -42,7 +42,7 @@ HELP_FILES= ${.CURDIR}/help.sparc64
LDFLAGS+= -static LDFLAGS+= -static
.if ${MK_ZFS} == "yes" .if ${MK_LOADER_ZFS} == "yes"
LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader
.endif .endif

2
stand/userboot/userboot/Makefile
View File

@ -45,7 +45,7 @@ VERSION_FILE= ${.CURDIR}/../userboot/version
LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so
.endif .endif
.if ${MK_ZFS} != "no" .if ${MK_LOADER_ZFS} != "no"
CFLAGS+= -DUSERBOOT_ZFS_SUPPORT CFLAGS+= -DUSERBOOT_ZFS_SUPPORT
HAVE_ZFS=yes HAVE_ZFS=yes
.endif .endif

2
tools/build/options/WITHOUT_LOADER_ZFS Normal file
View File

@ -0,0 +1,2 @@
.\" $FreeBSD$
Set to not build ZFS file system boot loader support.

2
tools/build/options/WITHOUT_ZFS
View File

@ -1,2 +1,2 @@
.\" $FreeBSD$ .\" $FreeBSD$
Set to not build ZFS file system. Set to not build ZFS file system kernel module, libraries, and user commands.