[source] kernel: remove echainiv.ko from kmod-crypto-iv

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 27 17:39:37 PDT 2016


neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/82aa061251f9efa68bea8fd4f3bcfb28d3654d5a

commit 82aa061251f9efa68bea8fd4f3bcfb28d3654d5a
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Wed Sep 28 02:36:56 2016 +0200

    kernel: remove echainiv.ko from kmod-crypto-iv
    
    There is a separate package kmod-crypto-echainiv for echainiv.ko. Selecting
    both packages led to a conflict, so remove the file from kmod-crypto-iv.
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
---
 package/kernel/linux/modules/crypto.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index bea0548..0a88c3b 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -123,12 +123,11 @@ $(eval $(call KernelPackage,crypto-rng))
 define KernelPackage/crypto-iv
   TITLE:=CryptoAPI initialization vectors
   DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq
-  KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 CONFIG_CRYPTO_ECHAINIV
+  KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2
   FILES:= \
 	$(LINUX_DIR)/crypto/eseqiv.ko \
-	$(LINUX_DIR)/crypto/chainiv.ko \
-	$(LINUX_DIR)/crypto/echainiv.ko at ge4.3
-  AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv echainiv at ge4.3)
+	$(LINUX_DIR)/crypto/chainiv.ko
+  AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv)
   $(call AddDepends/crypto)
 endef
 



More information about the lede-commits mailing list