Date: Sun, 22 Oct 2017 03:52:13 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324843 - in head/sys/boot: . i386/gptboot i386/gptzfsboot i386/libi386 Message-ID: <201710220352.v9M3qDko028117@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Oct 22 03:52:12 2017 New Revision: 324843 URL: https://svnweb.freebsd.org/changeset/base/324843 Log: Stopgap fix to the mistmatch between LOADER_GELI_SUPPORT and LOADER_NO_GELI_SUPPORT. To disable geli support in the loader, define LOADER_GELI_SUPPORT=no. Proper warnings for for old build options to follow. Sponsored by: Netflix Modified: head/sys/boot/Makefile.amd64 head/sys/boot/Makefile.i386 head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libi386/Makefile Modified: head/sys/boot/Makefile.amd64 ============================================================================== --- head/sys/boot/Makefile.amd64 Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/Makefile.amd64 Sun Oct 22 03:52:12 2017 (r324843) @@ -5,7 +5,7 @@ SUBDIR+= libsa32 SUBDIR+= zfs SUBDIR+= userboot -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif Modified: head/sys/boot/Makefile.i386 ============================================================================== --- head/sys/boot/Makefile.i386 Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/Makefile.i386 Sun Oct 22 03:52:12 2017 (r324843) @@ -4,6 +4,6 @@ SUBDIR+= efi SUBDIR+= libsa32 SUBDIR+= zfs -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif Modified: head/sys/boot/i386/gptboot/Makefile ============================================================================== --- head/sys/boot/i386/gptboot/Makefile Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/i386/gptboot/Makefile Sun Oct 22 03:52:12 2017 (r324843) @@ -41,7 +41,7 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \ CFLAGS.gcc+= --param max-inline-insns-single=100 -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${.CURDIR}/../../geli CFLAGS+= -I${.CURDIR}/../../.. Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 03:52:12 2017 (r324843) @@ -48,7 +48,7 @@ CFLAGS+= -Wno-tentative-definition-incomplete-type # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${.CURDIR}/../../geli LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/i386/libi386/Makefile Sun Oct 22 03:52:12 2017 (r324843) @@ -25,7 +25,7 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} CFLAGS+= -DDISK_DEBUG .endif -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" # Decrypt encrypted drives CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${.CURDIR}/../../geli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710220352.v9M3qDko028117>