Author: allanjude Date: Thu Apr 21 16:32:48 2016 New Revision: 298418 URL: https://svnweb.freebsd.org/changeset/base/298418
Log: 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 Modified: head/sys/boot/Makefile.amd64 head/sys/boot/Makefile.i386 Modified: head/sys/boot/Makefile.amd64 ============================================================================== --- head/sys/boot/Makefile.amd64 Thu Apr 21 16:30:28 2016 (r298417) +++ head/sys/boot/Makefile.amd64 Thu Apr 21 16:32:48 2016 (r298418) @@ -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 Modified: head/sys/boot/Makefile.i386 ============================================================================== --- head/sys/boot/Makefile.i386 Thu Apr 21 16:30:28 2016 (r298417) +++ head/sys/boot/Makefile.i386 Thu Apr 21 16:32:48 2016 (r298418) @@ -3,4 +3,7 @@ SUBDIR+= efi SUBDIR+= libstand32 SUBDIR+= zfs + +.if !defined(LOADER_NO_GELI_SUPPORT) SUBDIR+= geli +.endif _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
