Add more guards to disable GELIBOOT by defining LOADER_NO_GELI_SUPPORT

Reviewed by: cem Sponsored by: ScaleEngine Inc. Differential Revision: https://reviews.freebsd.org/D6049
2016-04-21 16:32:48 +00:00 · 2016-04-21 16:32:48 +00:00 · 892bfb4bb2
commit 892bfb4bb2
parent 59e2f057b6
2 changed files with 7 additions and 1 deletions
--- a/sys/boot/Makefile.amd64
+++ b/sys/boot/Makefile.amd64
@ -3,9 +3,12 @@
 SUBDIR+=		efi
 SUBDIR+=		libstand32
 SUBDIR+=		zfs
-SUBDIR+=		geli
 SUBDIR+=		userboot

+.if !defined(LOADER_NO_GELI_SUPPORT)
+SUBDIR+=		geli
+.endif
+
 .if ${MK_FORTH} != "no"
 SUBDIR+=		ficl32
 .endif
--- a/sys/boot/Makefile.i386
+++ b/sys/boot/Makefile.i386
@ -3,4 +3,7 @@
 SUBDIR+=		efi
 SUBDIR+=		libstand32
 SUBDIR+=		zfs
+
+.if !defined(LOADER_NO_GELI_SUPPORT)
 SUBDIR+=		geli
+.endif