mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

add a macro to compare kernel patch versions and use it for crypto and watchdog changes in 2.6.24+ kernels (closes: #3402) 

SVN-Revision: 11115
This commit is contained in:
Nicolas Thill 2008-05-11 20:56:51 +00:00
parent f060405005
commit e93e293b41
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel.mk
View File

@ -145,3 +145,7 @@ define AutoLoad
add_module $(1) "$(2)"; add_module $(1) "$(2)";
endef endef
define CompareKernelPatchVer
$(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
endef

11
package/kernel/modules/crypto.mk
View File

@ -13,10 +13,15 @@ CRYPTO_MENU:=Cryptographic API modules
# - des > des_generic # - des > des_generic
# - sha1 > sha1_generic # - sha1 > sha1_generic
# - sha256 > sha256_generic # - sha256 > sha256_generic
ifeq ($(KERNEL_PATCHVER),2.6.24) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
CRYPTO_GENERIC:=_generic CRYPTO_GENERIC:=_generic
endif endif
# XXX: added CRYPTO_PREFIX as a workaround for modules renamed in 2.6.25:
# - blkcipher -> crypto_blkcipher
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
CRYPTO_PREFIX:=crypto_
endif
# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is
# always set, even if no hash modules are selected # always set, even if no hash modules are selected
@ -35,7 +40,7 @@ define KernelPackage/crypto-core
CONFIG_CRYPTO_MANAGER CONFIG_CRYPTO_MANAGER
FILES:= \ FILES:= \
$(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/blkcipher.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/$(CRYPTO_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
@ -45,7 +50,7 @@ define KernelPackage/crypto-core
crypto_algapi \ crypto_algapi \
cryptomgr \ cryptomgr \
crypto_hash \ crypto_hash \
blkcipher \ $(CRYPTO_PREFIX)blkcipher \
cbc \ cbc \
ecb \ ecb \
deflate \ deflate \

2
package/kernel/modules/other.mk
View File

@ -270,7 +270,7 @@ $(eval $(call KernelPackage,mmc-at91))
ifeq ($(KERNEL),2.4) ifeq ($(KERNEL),2.4)
WATCHDOG_DIR=char WATCHDOG_DIR=char
endif endif
ifeq ($(KERNEL_PATCHVER),2.6.24) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
WATCHDOG_DIR=watchdog WATCHDOG_DIR=watchdog
endif endif
WATCHDOG_DIR?=char/watchdog WATCHDOG_DIR?=char/watchdog