Date: Wed, 20 Mar 2019 15:34:40 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r345327 - in stable/12: . share/mk stand/efi/boot1 stand/efi/libefi stand/efi/loader stand/i386 stand/i386/loader stand/libsa stand/sparc64 stand/sparc64/loader stand/userboot/userboot ... Message-ID: <201903201534.x2KFYefP058216@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Wed Mar 20 15:34:40 2019 New Revision: 345327 URL: https://svnweb.freebsd.org/changeset/base/345327 Log: MFC r342793 - selectively disable ZFS without disabling loader Sponsored by: iX Systems Added: stable/12/tools/build/options/WITHOUT_LOADER_ZFS - copied unchanged from r342793, head/tools/build/options/WITHOUT_LOADER_ZFS Modified: stable/12/.gitattributes stable/12/share/mk/src.opts.mk stable/12/stand/efi/boot1/Makefile stable/12/stand/efi/libefi/Makefile stable/12/stand/efi/loader/Makefile stable/12/stand/i386/Makefile stable/12/stand/i386/loader/Makefile stable/12/stand/libsa/Makefile stable/12/stand/sparc64/Makefile stable/12/stand/sparc64/loader/Makefile stable/12/stand/userboot/userboot/Makefile stable/12/sys/sys/param.h stable/12/tools/build/options/WITHOUT_ZFS Directory Properties: stable/12/ (props changed) Modified: stable/12/.gitattributes ============================================================================== --- stable/12/.gitattributes Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/.gitattributes Wed Mar 20 15:34:40 2019 (r345327) @@ -3,3 +3,4 @@ *.cpp diff=cpp *.hpp diff=cpp *.py diff=python +. svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS Modified: stable/12/share/mk/src.opts.mk ============================================================================== --- stable/12/share/mk/src.opts.mk Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/share/mk/src.opts.mk Wed Mar 20 15:34:40 2019 (r345327) @@ -187,6 +187,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 Modified: stable/12/stand/efi/boot1/Makefile ============================================================================== --- stable/12/stand/efi/boot1/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/efi/boot1/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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 Modified: stable/12/stand/efi/libefi/Makefile ============================================================================== --- stable/12/stand/efi/libefi/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/efi/libefi/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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 Modified: stable/12/stand/efi/loader/Makefile ============================================================================== --- stable/12/stand/efi/loader/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/efi/loader/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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 Modified: stable/12/stand/i386/Makefile ============================================================================== --- stable/12/stand/i386/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/i386/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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> Modified: stable/12/stand/i386/loader/Makefile ============================================================================== --- stable/12/stand/i386/loader/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/i386/loader/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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} Modified: stable/12/stand/libsa/Makefile ============================================================================== --- stable/12/stand/libsa/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/libsa/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -165,7 +165,7 @@ SRCS+= explicit_bzero.c .endif # Maybe ZFS -.if ${MK_ZFS} == "yes" +.if ${MK_LOADER_ZFS} == "yes" .include "${SASRC}/zfs/Makefile.inc" .endif Modified: stable/12/stand/sparc64/Makefile ============================================================================== --- stable/12/stand/sparc64/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/sparc64/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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> Modified: stable/12/stand/sparc64/loader/Makefile ============================================================================== --- stable/12/stand/sparc64/loader/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/sparc64/loader/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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 Modified: stable/12/stand/userboot/userboot/Makefile ============================================================================== --- stable/12/stand/userboot/userboot/Makefile Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/stand/userboot/userboot/Makefile Wed Mar 20 15:34:40 2019 (r345327) @@ -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 Modified: stable/12/sys/sys/param.h ============================================================================== --- stable/12/sys/sys/param.h Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/sys/sys/param.h Wed Mar 20 15:34:40 2019 (r345327) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1200504 /* Master, propagated to newvers */ +#define __FreeBSD_version 1200505 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Copied: stable/12/tools/build/options/WITHOUT_LOADER_ZFS (from r342793, head/tools/build/options/WITHOUT_LOADER_ZFS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/tools/build/options/WITHOUT_LOADER_ZFS Wed Mar 20 15:34:40 2019 (r345327, copy of r342793, head/tools/build/options/WITHOUT_LOADER_ZFS) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build ZFS file system boot loader support. Modified: stable/12/tools/build/options/WITHOUT_ZFS ============================================================================== --- stable/12/tools/build/options/WITHOUT_ZFS Wed Mar 20 13:13:50 2019 (r345326) +++ stable/12/tools/build/options/WITHOUT_ZFS Wed Mar 20 15:34:40 2019 (r345327) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903201534.x2KFYefP058216>