From d3831ca8e371637536cfb91bb0234d6cbf97da6e Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 7 May 2024 09:25:23 +0000 Subject: [PATCH] Remove lingering geom_bde references. --- sys/conf/files | 12 ++++-------- sys/modules/geom/geom_bde/Makefile | 10 ---------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 sys/modules/geom/geom_bde/Makefile diff --git a/sys/conf/files b/sys/conf/files index 4d7f28ceaaf1..4858b5868994 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -703,15 +703,15 @@ crypto/openssl/ossl_sha1.c optional ossl crypto/openssl/ossl_sha256.c optional ossl crypto/openssl/ossl_sha512.c optional ossl crypto/rc4/rc4.c optional netgraph_mppc_encryption -crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \ +crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | \ !random_loadable | wlan_ccmp -crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | !random_loadable +crypto/rijndael/rijndael-api-fst.c optional ekcd | !random_loadable crypto/rijndael/rijndael-api.c optional crypto | wlan_ccmp crypto/sha1.c optional carp | crypto | ether | \ netgraph_mppc_encryption | sctp -crypto/sha2/sha256c.c optional crypto | ekcd | geom_bde | \ +crypto/sha2/sha256c.c optional crypto | ekcd | \ !random_loadable | sctp | zfs -crypto/sha2/sha512c.c optional crypto | geom_bde | zfs +crypto/sha2/sha512c.c optional crypto | zfs crypto/skein/skein.c optional crypto | zfs crypto/skein/skein_block.c optional crypto | zfs crypto/siphash/siphash.c optional inet | inet6 | wg @@ -3630,10 +3630,6 @@ gdb/gdb_cons.c optional gdb gdb/gdb_main.c optional gdb gdb/gdb_packet.c optional gdb gdb/netgdb.c optional ddb debugnet gdb netgdb inet -geom/bde/g_bde.c optional geom_bde -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/cache/g_cache.c optional geom_cache geom/concat/g_concat.c optional geom_concat geom/eli/g_eli.c optional geom_eli diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile deleted file mode 100644 index 808775a79743..000000000000 --- a/sys/modules/geom/geom_bde/Makefile +++ /dev/null @@ -1,10 +0,0 @@ - -.PATH: ${SRCTOP}/sys/geom/bde -.PATH: ${SRCTOP}/sys/crypto/rijndael -.PATH: ${SRCTOP}/sys/crypto/sha2 - -KMOD= geom_bde -SRCS= g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c -SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha256c.c sha512c.c - -.include