diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-11-10 23:54:48 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-11-10 23:54:48 +0000 |
| commit | 4728f534ff6d6644c6f80d2028503670859af576 (patch) | |
| tree | fef874a9ab9b842747e7537f1d4aa54e8dba6566 /sys/boot/i386/loader/Makefile | |
| parent | a179cd9114f08949088458bc6cef1f094f6c36ce (diff) | |
| download | src-4728f534ff6d6644c6f80d2028503670859af576.tar.gz src-4728f534ff6d6644c6f80d2028503670859af576.zip | |
Move LOADER_{NO,}_GELI_SUPPORT to MK_LOADER_GELI
Transition to WITH/WITHOUT_LOADER_GELI to flag support or not of GELI
in the boot loaders. Add HAVE_GELI so components can flag they need
support (since it's too large to include everywhere). Add temporary
warnings for the old forms to ease transition.
Also, update test script to build without GELI on x86.
Sponsored by: Netflix
Notes
Notes:
svn path=/head/; revision=325693
Diffstat (limited to 'sys/boot/i386/loader/Makefile')
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index e9d8f897a164..a79b4fbdbcc2 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +HAVE_GELI= yes + LOADER_NET_SUPPORT?= yes LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= yes @@ -38,15 +40,6 @@ CFLAGS+= -DLOADER_FIREWIRE_SUPPORT LIBFIREWIRE= ${BOOTOBJ}/i386/libfirewire/libfirewire.a .endif -.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" -CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${BOOTSRC}/geli -LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a -.PATH: ${SYSDIR}/opencrypto -SRCS+= xform_aes_xts.c -CFLAGS+= -I${SYSDIR} -D_STAND -.endif - # Always add MI sources .include "${BOOTSRC}/loader.mk" CFLAGS+= -I. |