From owner-svn-src-head@freebsd.org Sun Oct 22 03:52:24 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 11B5CE46F25; Sun, 22 Oct 2017 03:52:24 +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 BDEFD778CF; Sun, 22 Oct 2017 03:52:23 +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 v9M3qM4U028232; Sun, 22 Oct 2017 03:52:22 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M3qMwc028227; Sun, 22 Oct 2017 03:52:22 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710220352.v9M3qMwc028227@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:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324845 - in head/sys/boot/i386: gptboot gptzfsboot libi386 loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot/i386: gptboot gptzfsboot libi386 loader X-SVN-Commit-Revision: 324845 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:24 -0000 Author: imp Date: Sun Oct 22 03:52:22 2017 New Revision: 324845 URL: https://svnweb.freebsd.org/changeset/base/324845 Log: Use BOOTOBJ and BOOTDIR to find geli includes and libraries. Sponsored by: Netflix Modified: head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libi386/Makefile head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/i386/gptboot/Makefile ============================================================================== --- head/sys/boot/i386/gptboot/Makefile Sun Oct 22 03:52:17 2017 (r324844) +++ head/sys/boot/i386/gptboot/Makefile Sun Oct 22 03:52:22 2017 (r324845) @@ -43,9 +43,9 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli +CFLAGS+= -I${BOOTDIR}/geli CFLAGS+= -I${.CURDIR}/../../.. -LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a +LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto OPENCRYPTO_XTS= xform_aes_xts.o .endif Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 03:52:17 2017 (r324844) +++ head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 03:52:22 2017 (r324845) @@ -50,8 +50,8 @@ CFLAGS+= -DSKEIN_LOOP=111 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli -LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a +CFLAGS+= -I${BOOTDIR}/geli +LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto OPENCRYPTO_XTS= xform_aes_xts.o .endif Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Sun Oct 22 03:52:17 2017 (r324844) +++ head/sys/boot/i386/libi386/Makefile Sun Oct 22 03:52:22 2017 (r324845) @@ -28,7 +28,7 @@ CFLAGS+= -DDISK_DEBUG .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" # Decrypt encrypted drives CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli +CFLAGS+= -I${BOOTDIR}/geli .endif .if !defined(BOOT_HIDE_SERIAL_NUMBERS) Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Sun Oct 22 03:52:17 2017 (r324844) +++ head/sys/boot/i386/loader/Makefile Sun Oct 22 03:52:22 2017 (r324845) @@ -42,8 +42,8 @@ HAVE_ISABUS= yes .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${.CURDIR}/../../geli -LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a +CFLAGS+= -I${BOOTDIR}/geli +LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto SRCS+= xform_aes_xts.c CFLAGS+= -I${.CURDIR}/../../.. -D_STAND