From owner-svn-src-all@freebsd.org  Thu Apr 21 16:32:49 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB72DB16F85;
 Thu, 21 Apr 2016 16:32:49 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D7541714;
 Thu, 21 Apr 2016 16:32:49 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3LGWmKB045953;
 Thu, 21 Apr 2016 16:32:48 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3LGWmln045951;
 Thu, 21 Apr 2016 16:32:48 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201604211632.u3LGWmln045951@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Thu, 21 Apr 2016 16:32:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298418 - head/sys/boot
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Apr 2016 16:32:49 -0000

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