diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-09 23:30:09 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-09 23:30:09 +0000 |
| commit | 3b659a2519fa7dc90b4cd3246da43dfc484936c5 (patch) | |
| tree | 4f78f1f6857da42fc45a7df7202ac738e328b856 /package/kernel | |
| parent | be08c96f014092d395205784d6b908b14597f9f4 (diff) | |
| download | upstream-3b659a2519fa7dc90b4cd3246da43dfc484936c5.tar.gz upstream-3b659a2519fa7dc90b4cd3246da43dfc484936c5.tar.bz2 upstream-3b659a2519fa7dc90b4cd3246da43dfc484936c5.zip | |
crypto: The if statement for twofish did not work, deflate depends on zlib_deflate
SVN-Revision: 26569
Diffstat (limited to 'package/kernel')
| -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 467db8ee23..0a843f8669 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 |