D46634.diff
No OneTemporary
Actions

Size

725 B

Referenced Files

None

Subscribers

None

D46634.diff
View Options

	diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
	--- a/stand/libsa/Makefile
	+++ b/stand/libsa/Makefile
	@@ -164,6 +164,10 @@
	.PATH: ${SYSDIR}/libkern
	SRCS+= explicit_bzero.c crc32_libkern.c

	+# Bits from GELI which are reused elsewhere
	+.PATH: ${SYSDIR}/geom/eli
	+SRCS+= g_eli_hmac.c pkcs5v2.c
	+
	# Maybe GELI
	.if ${MK_LOADER_GELI} == "yes"
	.include "${SASRC}/geli/Makefile.inc"
	diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc
	--- a/stand/libsa/geli/Makefile.inc
	+++ b/stand/libsa/geli/Makefile.inc
	@@ -21,10 +21,8 @@
	.endfor
	SRCS+= geliboot.c \
	geliboot_crypto.c \
	- g_eli_hmac.c \
	g_eli_key.c \
	g_eli_key_cache.c \
	- pkcs5v2.c \

	# aes
	.PATH: ${SYSDIR}/opencrypto