diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-11-09 21:16:52 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-11-09 21:16:52 +0000 |
| commit | 7cdbaef39d2068aacc8fd06582a18591eac859ea (patch) | |
| tree | c53834093241bc4d12dc1d6874d58e3d3d875b12 /package/kernel/modules/crypto.mk | |
| parent | 04fd1b5e8c944dc4431061dc49c552cf942fff62 (diff) | |
| download | upstream-7cdbaef39d2068aacc8fd06582a18591eac859ea.tar.gz upstream-7cdbaef39d2068aacc8fd06582a18591eac859ea.tar.bz2 upstream-7cdbaef39d2068aacc8fd06582a18591eac859ea.zip | |
package: kernel: add handling for 3.2 renames (and some missed ones for 3.1)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28897 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/crypto.mk')
| -rw-r--r-- | package/kernel/modules/crypto.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 5f542d11b3..8612c34fa8 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -64,7 +64,7 @@ $(eval $(call KernelPackage,crypto-manager)) define KernelPackage/crypto-user TITLE:=CryptoAPI userspace interface - DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0 + DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_31&&!LINUX_2_6_36&&!LINUX_2_6_37 KCONFIG:= \ CONFIG_CRYPTO_USER_API \ CONFIG_CRYPTO_USER_API_HASH \ @@ -364,7 +364,6 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_WP512 FILES:= \ $(LINUX_DIR)/crypto/anubis.ko \ - $(LINUX_DIR)/crypto/blowfish.ko \ $(LINUX_DIR)/crypto/camellia.ko \ $(LINUX_DIR)/crypto/cast5.ko \ $(LINUX_DIR)/crypto/cast6.ko \ @@ -382,6 +381,12 @@ define KernelPackage/crypto-misc else FILES += $(LINUX_DIR)/crypto/twofish_generic.ko endif + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,3.1)),1) + FILES += $(LINUX_DIR)/crypto/blowfish.ko + else + FILES += $(LINUX_DIR)/crypto/blowfish_common.ko \ + FILES += $(LINUX_DIR)/crypto/blowfish_generic.ko + endif $(call AddDepends/crypto) endef @@ -395,7 +400,7 @@ $(eval $(call KernelPackage,crypto-misc)) define KernelPackage/crypto-ocf TITLE:=OCF modules - DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager + DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager @!LINUX_3_2||BROKEN KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ |