From b1bcbe76f22549d694bef6d5d9060ffa90a2c1ab Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Sun, 22 Oct 2017 03:52:12 +0000
Subject: [PATCH] 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
---
 sys/boot/Makefile.amd64           | 2 +-
 sys/boot/Makefile.i386            | 2 +-
 sys/boot/i386/gptboot/Makefile    | 2 +-
 sys/boot/i386/gptzfsboot/Makefile | 2 +-
 sys/boot/i386/libi386/Makefile    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/boot/Makefile.amd64 b/sys/boot/Makefile.amd64
index 1061a9d17552..c8da2478d908 100644
--- a/sys/boot/Makefile.amd64
+++ b/sys/boot/Makefile.amd64
@@ -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
 
diff --git a/sys/boot/Makefile.i386 b/sys/boot/Makefile.i386
index a414f4b8c39d..90c3e8ba6b65 100644
--- a/sys/boot/Makefile.i386
+++ b/sys/boot/Makefile.i386
@@ -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
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index e85c54654eca..679e9c753914 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -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}/../../..
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index a81ad2e15005..e9de874a9d21 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -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
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 98f6d686a526..99cc2592af72 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -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