aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-09-28 02:36:56 +0200
committerRalph Sennhauser <ralph.sennhauser@gmail.com>2016-11-03 16:42:32 +0100
commit8ad3f44dcefb72e850091ef857f1d0236ef66c4b (patch)
treef5ecd1de4668bbe08fbc2be36a33a1d28a90bc79
parentcabb0c506526fe468e4aa985086e50c440192122 (diff)
downloadmaster-187ad058-8ad3f44dcefb72e850091ef857f1d0236ef66c4b.tar.gz
master-187ad058-8ad3f44dcefb72e850091ef857f1d0236ef66c4b.tar.bz2
master-187ad058-8ad3f44dcefb72e850091ef857f1d0236ef66c4b.zip
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@universe-factory.net> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
-rw-r--r--package/kernel/linux/modules/crypto.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index cc62f2cc27..d7dbad657e 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@ge4.3
- AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv echainiv@ge4.3)
+ $(LINUX_DIR)/crypto/chainiv.ko
+ AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv)
$(call AddDepends/crypto)
endef