Use BOOTOBJ and BOOTDIR to find geli includes and libraries.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-10-22 03:52:22 +00:00
parent 4b32ccfd81
commit 4b165a5f12
4 changed files with 7 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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