From 139c85ce53a6bbd94e1ab1b92b2014e32d9e23e8 Mon Sep 17 00:00:00 2001 From: mmacy Date: Sat, 5 Jan 2019 22:45:20 +0000 Subject: [PATCH] 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 --- .gitattributes | 1 + share/mk/src.opts.mk | 2 ++ stand/efi/boot1/Makefile | 2 +- stand/efi/libefi/Makefile | 2 +- stand/efi/loader/Makefile | 2 +- stand/i386/Makefile | 2 +- stand/i386/loader/Makefile | 4 ++-- stand/libsa/Makefile | 2 +- stand/sparc64/Makefile | 2 +- stand/sparc64/loader/Makefile | 6 +++--- stand/userboot/userboot/Makefile | 2 +- tools/build/options/WITHOUT_LOADER_ZFS | 2 ++ tools/build/options/WITHOUT_ZFS | 2 +- 13 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 tools/build/options/WITHOUT_LOADER_ZFS diff --git a/.gitattributes b/.gitattributes index d3452fd3cef7..4d7b655b501e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ *.cpp diff=cpp *.hpp diff=cpp *.py diff=python +. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index f5c27cf141ea..54fcdff9d83f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 88bbb312970c..721d193df5af 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -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 diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile index f45f3a70155e..9b0330815900 100644 --- a/stand/efi/libefi/Makefile +++ b/stand/efi/libefi/Makefile @@ -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 diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 94c06d01bbfa..58c58533ab2e 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -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 diff --git a/stand/i386/Makefile b/stand/i386/Makefile index 36eba8b1bd59..2a9ead4c8e72 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -20,6 +20,6 @@ SUBDIR.yes+= pxeldr SUBDIR.yes+= kgzldr .endif -SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot +SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot .include diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 97a5d65145c7..dbb993eaad02 100644 --- a/stand/i386/loader/Makefile +++ b/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}: ${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} diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index d59db0fd51b9..95cededc3233 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -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 diff --git a/stand/sparc64/Makefile b/stand/sparc64/Makefile index 0b20d007d0ec..da9fba32e071 100644 --- a/stand/sparc64/Makefile +++ b/stand/sparc64/Makefile @@ -5,6 +5,6 @@ NO_OBJ=t .include SUBDIR.yes= boot1 loader -SUBDIR.${MK_ZFS}+=zfsboot +SUBDIR.${MK_LOADER_ZFS}+=zfsboot .include diff --git a/stand/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile index 47052b743463..7bc2ee5aa9fa 100644 --- a/stand/sparc64/loader/Makefile +++ b/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 @@ 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 diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 630d56b29d0f..d8e71b9781d7 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -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 diff --git a/tools/build/options/WITHOUT_LOADER_ZFS b/tools/build/options/WITHOUT_LOADER_ZFS new file mode 100644 index 000000000000..d3b8c7d00c78 --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_ZFS @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build ZFS file system boot loader support. diff --git a/tools/build/options/WITHOUT_ZFS b/tools/build/options/WITHOUT_ZFS index bd21b7889e77..230494557eb7 100644 --- a/tools/build/options/WITHOUT_ZFS +++ b/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.