add a macro to compare kernel patch versions and use it for crypto and watchdog chang...

SVN-Revision: 11115

diff --git a/include/kernel.mk b/include/kernel.mk
index 52355dcdd313d79a148ca92afbac7cab7bb7ba93..b80c3b63ff8ffc6b6c7aea3d44055d43915ddde4 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -145,3 +145,7 @@ define AutoLoad
   add_module $(1) "$(2)";
 endef
 
+define CompareKernelPatchVer
+  $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
+endef
+

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 4bb591974f601f5d150ccd8e514f28c5fb8a2fd4..68ccb60cd1ce1727ddc903fcd702962d90523854 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -13,10 +13,15 @@ CRYPTO_MENU:=Cryptographic API modules
 #  - des > des_generic
 #  - sha1 > sha1_generic
 #  - sha256 > sha256_generic
-ifeq ($(KERNEL_PATCHVER),2.6.24)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
   CRYPTO_GENERIC:=_generic
 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 
 # always set, even if no hash modules are selected
@@ -35,7 +40,7 @@ define KernelPackage/crypto-core
        CONFIG_CRYPTO_MANAGER
   FILES:= \
        $(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/deflate.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
@@ -45,7 +50,7 @@ define KernelPackage/crypto-core
        crypto_algapi \
        cryptomgr \
        crypto_hash \
-       blkcipher \
+       $(CRYPTO_PREFIX)blkcipher \
        cbc \
        ecb \
        deflate \

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index bf674644d4052324793629d39641e53ed26959dc..482c06c4a8195255a5931fc524b9d5f485106373 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -270,7 +270,7 @@ $(eval $(call KernelPackage,mmc-at91))
 ifeq ($(KERNEL),2.4)
   WATCHDOG_DIR=char
 endif
-ifeq ($(KERNEL_PATCHVER),2.6.24)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
   WATCHDOG_DIR=watchdog
 endif
 WATCHDOG_DIR?=char/watchdog