projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8cf78c1
)
crypto: The if statement for twofish did not work, deflate depends on zlib_deflate
author
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 9 Apr 2011 23:30:09 +0000
(23:30 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 9 Apr 2011 23:30:09 +0000
(23:30 +0000)
SVN-Revision: 26569
package/kernel/modules/crypto.mk
patch
|
blob
|
history
diff --git
a/package/kernel/modules/crypto.mk
b/package/kernel/modules/crypto.mk
index 467db8ee23aed3f78eafc8e61e648e7294b753a4..0a843f8669704cff237d299e1093b08964fe3e52 100644
(file)
--- a/
package/kernel/modules/crypto.mk
+++ b/
package/kernel/modules/crypto.mk
@@
-215,9
+215,11
@@
$(eval $(call KernelPackage,crypto-des))
define KernelPackage/crypto-deflate
TITLE:=Deflate compression CryptoAPI module
define KernelPackage/crypto-deflate
TITLE:=Deflate compression CryptoAPI module
- KCONFIG:=CONFIG_CRYPTO_DEFLATE
- FILES:=$(LINUX_DIR)/crypto/deflate.ko
- AUTOLOAD:=$(call AutoLoad,09,deflate)
+ KCONFIG:=CONFIG_ZLIB_DEFLATE \
+ CONFIG_CRYPTO_DEFLATE
+ FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko \
+ $(LINUX_DIR)/crypto/deflate.ko
+ AUTOLOAD:=$(call AutoLoad,09,zlib_deflate deflate)
$(call AddDepends/crypto)
endef
$(call AddDepends/crypto)
endef
@@
-317,9
+319,12
@@
define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \
$(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \
$(LINUX_DIR)/crypto/tea.ko \
$(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \
$(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \
$(LINUX_DIR)/crypto/tea.ko \
- $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),,$(LINUX_DIR)/crypto/twofish.ko) \
- $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)),,$(LINUX_DIR)/crypto/twofish_generic.ko) \
$(LINUX_DIR)/crypto/wp512.ko
$(LINUX_DIR)/crypto/wp512.ko
+ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),1)
+ FILES += $(LINUX_DIR)/crypto/twofish.ko
+ else
+ FILES += $(LINUX_DIR)/crypto/twofish_generic.ko
+ endif
$(call AddDepends/crypto)
endef
$(call AddDepends/crypto)
endef