From 8ad3f44dcefb72e850091ef857f1d0236ef66c4b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 28 Sep 2016 02:36:56 +0200 Subject: 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 Signed-off-by: Ralph Sennhauser --- 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 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 -- cgit v1.2.3 From 23e46f1c2ae2bbeb874ce4990cbfeb4cf39a747a Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Fri, 14 Oct 2016 16:19:24 +0200 Subject: kernel: kmod-crypto-iv dropped in Linux 4.8 Commit 3a01d0ee2b991c8c267620e63a4ab47cd8c30cc4 upstream Signed-off-by: Ralph Sennhauser --- package/kernel/linux/modules/crypto.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index d7dbad657e..f11ebd931a 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -125,8 +125,8 @@ define KernelPackage/crypto-iv DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 FILES:= \ - $(LINUX_DIR)/crypto/eseqiv.ko \ - $(LINUX_DIR)/crypto/chainiv.ko + $(LINUX_DIR)/crypto/eseqiv.ko@lt4.8 \ + $(LINUX_DIR)/crypto/chainiv.ko@lt4.8 AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv) $(call AddDepends/crypto) endef -- cgit v1.2.3