git: bb7ddd077c25 - main - stand geli: Restore include path to LDRSRC.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Jul 2022 16:09:00 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb7ddd077c2528b37399304d7a9bf70b25c42b47 commit bb7ddd077c2528b37399304d7a9bf70b25c42b47 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-07-22 15:56:18 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2022-07-22 16:08:46 +0000 stand geli: Restore include path to LDRSRC. Various GELI sources need bootstrap.h and disk.h. In theory they shouldn't need anything outside of libsa, but disk.h and bootstrap.h are currently required. This fixes the build with MK_LOADER_ZFS=no. Obtained from: CheriBSD Fixes: eaf7aabddcde stand: geli CFLAGS tightening Sponsored by: DARPA Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35861 --- stand/libsa/geli/Makefile.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 841eea397807..88a3bad82a0e 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -26,11 +26,11 @@ SRCS+= ${i} # local GELI Implementation .PATH: ${SYSDIR}/geom/eli +.for i in geliboot.c geliboot_crypto.c gelidev.c geli_metadata.c +CFLAGS.${i}+= -I${LDRSRC} +SRCS+= ${i} +.endfor SRCS+= \ - geliboot.c \ - geliboot_crypto.c \ - gelidev.c \ - geli_metadata.c \ g_eli_hmac.c \ g_eli_key.c \ g_eli_key_cache.c \