svn commit: r324845 - in head/sys/boot/i386: gptboot gptzfsboot libi386 loader

[Warner Losh]

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