From 5ca1fcfe0626d843e217d9d89a8dee047cc2e672 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 27 Jul 2005 21:47:55 +0000
Subject: [PATCH] Connect GEOM_ELI class to the build.

MFC after:	1 week
---
 include/Makefile          | 4 ++--
 sbin/geom/class/Makefile  | 1 +
 sys/conf/NOTES            | 1 +
 sys/conf/files            | 5 +++++
 sys/conf/options          | 1 +
 sys/modules/geom/Makefile | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/Makefile b/include/Makefile
index 4fb1ad18a5ff..d336eaad0ed3 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -42,8 +42,8 @@ LSUBDIRS=	cam/scsi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
 	fs/unionfs \
-	geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \
-	geom/shsec geom/stripe \
+	geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \
+	geom/raid3 geom/shsec geom/stripe \
 	isofs/cd9660 \
 	netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
 	netgraph/atm netgraph/netflow \
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index 84185cfce190..fb484ec3d0f3 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 SUBDIR=	concat
+SUBDIR+=eli
 SUBDIR+=label
 SUBDIR+=mirror
 SUBDIR+=nop
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 194fb3bc46b3..88ccc6dc7c66 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -131,6 +131,7 @@ options 	GEOM_APPLE		# Apple partitioning
 options 	GEOM_BDE		# Disk encryption.
 options 	GEOM_BSD		# BSD disklabels
 options 	GEOM_CONCAT		# Disk concatenation.
+options 	GEOM_ELI		# Disk encryption.
 options 	GEOM_FOX		# Redundant path mitigation
 options 	GEOM_GATE		# Userland services.
 options 	GEOM_GPT		# GPT partitioning
diff --git a/sys/conf/files b/sys/conf/files
index 7f6a585cb8f3..b449cbc81639 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1028,6 +1028,11 @@ geom/bde/g_bde_crypt.c		optional geom_bde
 geom/bde/g_bde_lock.c		optional geom_bde
 geom/bde/g_bde_work.c		optional geom_bde
 geom/concat/g_concat.c		optional geom_concat
+geom/eli/g_eli.c		optional geom_eli
+geom/eli/g_eli_crypto.c		optional geom_eli
+geom/eli/g_eli_ctl.c		optional geom_eli
+geom/eli/g_eli_key.c		optional geom_eli
+geom/eli/pkcs5v2.c		optional geom_eli
 geom/gate/g_gate.c		optional geom_gate
 geom/geom_aes.c			optional geom_aes
 geom/geom_apple.c		optional geom_apple
diff --git a/sys/conf/options b/sys/conf/options
index 02075df3af15..dee8e1cfbd8b 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -76,6 +76,7 @@ GEOM_APPLE	opt_geom.h
 GEOM_BDE	opt_geom.h
 GEOM_BSD	opt_geom.h
 GEOM_CONCAT	opt_geom.h
+GEOM_ELI	opt_geom.h
 GEOM_FOX	opt_geom.h
 GEOM_GATE	opt_geom.h
 GEOM_GPT	opt_geom.h
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index 08b99cef80f9..cf99e377f7c8 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -5,6 +5,7 @@ SUBDIR=	geom_apple \
 	geom_bsd \
 	geom_ccd \
 	geom_concat \
+	geom_eli \
 	geom_fox \
 	geom_gate \
 	geom_gpt \