projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0ce698
)
kernel: remove echainiv.ko from kmod-crypto-iv
author
Matthias Schiffer
<
[email protected]
>
Wed, 28 Sep 2016 00:36:56 +0000
(
02:36
+0200)
committer
Matthias Schiffer
<
[email protected]
>
Wed, 28 Sep 2016 00:39:18 +0000
(
02:39
+0200)
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 <
[email protected]
>
package/kernel/linux/modules/crypto.mk
patch
|
blob
|
history
diff --git
a/package/kernel/linux/modules/crypto.mk
b/package/kernel/linux/modules/crypto.mk
index bea05488abd23025fcbcd6ebb602359f375268d7..0a88c3be125069f9504d011787f1b608b22eb651 100644
(file)
--- 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/
[email protected]
- AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv
[email protected]
)
+ $(LINUX_DIR)/crypto/chainiv.ko
+ AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv)
$(call AddDepends/crypto)
endef