From owner-svn-src-head@freebsd.org Mon Dec 4 01:14:13 2017 Return-Path: Delivered-To: svn-src-head@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 8E1C5E6F75C; Mon, 4 Dec 2017 01:14:13 +0000 (UTC) (envelope-from imp@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 5424772075; Mon, 4 Dec 2017 01:14:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB41ECOF078350; Mon, 4 Dec 2017 01:14:12 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB41ECVk078348; Mon, 4 Dec 2017 01:14:12 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201712040114.vB41ECVk078348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 4 Dec 2017 01:14:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326504 - head/stand X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand X-SVN-Commit-Revision: 326504 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2017 01:14:13 -0000 Author: imp Date: Mon Dec 4 01:14:12 2017 New Revision: 326504 URL: https://svnweb.freebsd.org/changeset/base/326504 Log: Switch to proper MK_LOADER_GELI tests. Submitted by: peter@ Modified: head/stand/Makefile.amd64 head/stand/Makefile.i386 Modified: head/stand/Makefile.amd64 ============================================================================== --- head/stand/Makefile.amd64 Sun Dec 3 22:02:30 2017 (r326503) +++ head/stand/Makefile.amd64 Mon Dec 4 01:14:12 2017 (r326504) @@ -11,7 +11,7 @@ SUBDIR+= ficl32 SUBDIR+= efi SUBDIR+= userboot -.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" +.if ${MK_LOADER_GELI} == "yes" SUBDIR+= geli .endif Modified: head/stand/Makefile.i386 ============================================================================== --- head/stand/Makefile.i386 Sun Dec 3 22:02:30 2017 (r326503) +++ head/stand/Makefile.i386 Mon Dec 4 01:14:12 2017 (r326504) @@ -1,6 +1,6 @@ # $FreeBSD$ -.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" +.if ${MK_LOADER_GELI} == "yes" SUBDIR+= geli .endif .if ${MK_ZFS} != "no"