Date: Thu, 21 Apr 2016 16:32:48 +0000 (UTC) From: Allan Jude <allanjude@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298418 - head/sys/boot Message-ID: <201604211632.u3LGWmln045951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604211632.u3LGWmln045951>