diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-09 23:30:09 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-09 23:30:09 +0000 |
| commit | 4a3fbc5e68c2144cf26da0bcadc6099540a1640d (patch) | |
| tree | be96d64dcb069aed1dfd235452d930641dfc0b78 | |
| parent | 8982313f7e2b50f215e1d12eb2fd1bace78e3282 (diff) | |
crypto: The if statement for twofish did not work, deflate depends on zlib_deflate
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26569 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/modules/crypto.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 467db8ee2..0a843f866 100644 --- 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 - 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 @@ -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 \ - $(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 + 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 |