From: Matthias Schiffer Date: Wed, 28 Sep 2016 00:36:56 +0000 (+0200) Subject: kernel: remove echainiv.ko from kmod-crypto-iv X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=82aa061251f9efa68bea8fd4f3bcfb28d3654d5a;p=openwrt%2Fstaging%2Fnoltari.git 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 --- diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index bea05488ab..0a88c3be12 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