Ignore:
Timestamp:
2011-04-10T01:30:09+02:00 (6 years ago)
Author:
hauke
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/crypto.mk

    r26413 r26569  
    216216define KernelPackage/crypto-deflate 
    217217  TITLE:=Deflate compression CryptoAPI module 
    218   KCONFIG:=CONFIG_CRYPTO_DEFLATE 
    219   FILES:=$(LINUX_DIR)/crypto/deflate.ko 
    220   AUTOLOAD:=$(call AutoLoad,09,deflate) 
     218  KCONFIG:=CONFIG_ZLIB_DEFLATE \ 
     219        CONFIG_CRYPTO_DEFLATE 
     220  FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko \ 
     221        $(LINUX_DIR)/crypto/deflate.ko 
     222  AUTOLOAD:=$(call AutoLoad,09,zlib_deflate deflate) 
    221223  $(call AddDepends/crypto) 
    222224endef 
     
    318320        $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \ 
    319321        $(LINUX_DIR)/crypto/tea.ko \ 
    320         $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),,$(LINUX_DIR)/crypto/twofish.ko) \ 
    321         $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)),,$(LINUX_DIR)/crypto/twofish_generic.ko) \ 
    322322        $(LINUX_DIR)/crypto/wp512.ko 
     323  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),1) 
     324    FILES += $(LINUX_DIR)/crypto/twofish.ko 
     325  else 
     326    FILES += $(LINUX_DIR)/crypto/twofish_generic.ko 
     327  endif 
    323328  $(call AddDepends/crypto) 
    324329endef 
Note: See TracChangeset for help on using the changeset viewer.