d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stopgap fix to the mistmatch between LOADER_GELI_SUPPORT and

Browse Source 
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
This commit is contained in:
imp 2017-10-22 03:52:12 +00:00
parent 5bee4e133f
commit b1bcbe76f2
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/Makefile.amd64
View File

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

2
sys/boot/Makefile.i386
View File

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

2
sys/boot/i386/gptboot/Makefile
View File

@ -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}/../../..

2
sys/boot/i386/gptzfsboot/Makefile
View File

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

2
sys/boot/i386/libi386/Makefile
View File

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