From owner-svn-src-head@freebsd.org Sun Oct 22 03:52:14 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 6AAD0E46EF7; Sun, 22 Oct 2017 03:52:14 +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 434D7777E1; Sun, 22 Oct 2017 03:52:14 +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 v9M3qDuB028122; Sun, 22 Oct 2017 03:52:13 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M3qDko028117; Sun, 22 Oct 2017 03:52:13 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710220352.v9M3qDko028117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 22 Oct 2017 03:52:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324843 - in head/sys/boot: . i386/gptboot i386/gptzfsboot i386/libi386 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . i386/gptboot i386/gptzfsboot i386/libi386 X-SVN-Commit-Revision: 324843 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.23 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: Sun, 22 Oct 2017 03:52:14 -0000 Author: imp Date: Sun Oct 22 03:52:12 2017 New Revision: 324843 URL: https://svnweb.freebsd.org/changeset/base/324843 Log: Stopgap fix to the mistmatch between LOADER_GELI_SUPPORT and LOADER_NO_GELI_SUPPORT. To disable geli support in the loader, define LOADER_GELI_SUPPORT=no. Proper warnings for for old build options to follow. Sponsored by: Netflix Modified: head/sys/boot/Makefile.amd64 head/sys/boot/Makefile.i386 head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libi386/Makefile Modified: head/sys/boot/Makefile.amd64 ============================================================================== --- head/sys/boot/Makefile.amd64 Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/Makefile.amd64 Sun Oct 22 03:52:12 2017 (r324843) @@ -5,7 +5,7 @@ SUBDIR+= libsa32 SUBDIR+= zfs SUBDIR+= userboot -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif Modified: head/sys/boot/Makefile.i386 ============================================================================== --- head/sys/boot/Makefile.i386 Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/Makefile.i386 Sun Oct 22 03:52:12 2017 (r324843) @@ -4,6 +4,6 @@ SUBDIR+= efi SUBDIR+= libsa32 SUBDIR+= zfs -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" SUBDIR+= geli .endif Modified: head/sys/boot/i386/gptboot/Makefile ============================================================================== --- head/sys/boot/i386/gptboot/Makefile Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/i386/gptboot/Makefile Sun Oct 22 03:52:12 2017 (r324843) @@ -41,7 +41,7 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \ CFLAGS.gcc+= --param max-inline-insns-single=100 -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${.CURDIR}/../../geli CFLAGS+= -I${.CURDIR}/../../.. Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 03:52:12 2017 (r324843) @@ -48,7 +48,7 @@ CFLAGS+= -Wno-tentative-definition-incomplete-type # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${.CURDIR}/../../geli LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Sun Oct 22 03:52:08 2017 (r324842) +++ head/sys/boot/i386/libi386/Makefile Sun Oct 22 03:52:12 2017 (r324843) @@ -25,7 +25,7 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} CFLAGS+= -DDISK_DEBUG .endif -.if !defined(LOADER_NO_GELI_SUPPORT) +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" # Decrypt encrypted drives CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${.CURDIR}/../../geli