crypto: The if statement for twofish did not work, deflate depends on zlib_deflate

SVN-Revision: 26569
lede-17.01
Hauke Mehrtens 2011-04-09 23:30:09 +00:00
parent be08c96f01
commit 3b659a2519
1 changed files with 10 additions and 5 deletions

View File

@ -215,9 +215,11 @@ $(eval $(call KernelPackage,crypto-des))
define KernelPackage/crypto-deflate define KernelPackage/crypto-deflate
TITLE:=Deflate compression CryptoAPI module TITLE:=Deflate compression CryptoAPI module
KCONFIG:=CONFIG_CRYPTO_DEFLATE KCONFIG:=CONFIG_ZLIB_DEFLATE \
FILES:=$(LINUX_DIR)/crypto/deflate.ko CONFIG_CRYPTO_DEFLATE
AUTOLOAD:=$(call AutoLoad,09,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) $(call AddDepends/crypto)
endef endef
@ -317,9 +319,12 @@ define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \ $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \
$(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \ $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \
$(LINUX_DIR)/crypto/tea.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) $(call AddDepends/crypto)
endef endef