kernel.mk: add a new helper for comparing kernel versions, which can take 1 - 4 field...

implement CompareKernelPatchVer using this new helper
implement kernel_patchver_{gt,ge,eq,le,lt}, which are more convenient for use with inline $(if)

SVN-Revision: 27087

diff --git a/include/kernel.mk b/include/kernel.mk
index 5e8df444fb433736543eff726ca432feb1631671..e120cef1fa2527526469195c0a21f81831c6743f 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -161,11 +161,20 @@ define AutoLoad
   add_module "$(1)" "$(2)" "$(3)";
 endef
 
   add_module "$(1)" "$(2)" "$(3)";
 endef
 

+version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0)
+kernel_version_merge=$$(( ($(call version_field,1,$(1)) << 24) + ($(call version_field,2,$(1)) << 16) + ($(call version_field,3,$(1)) << 8) + $(call version_field,4,$(1)) ))
+

 ifdef DUMP
 ifdef DUMP

-  CompareKernelPatchVer=0
+  kernel_version_cmp=

 else
 else

-  define CompareKernelPatchVer
-    $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
-  endef
+  kernel_version_cmp=$(shell [ $(call kernel_version_merge,$(call split_version,$(2))) $(1) $(call kernel_version_merge,$(call split_version,$(3))) ] && echo 1 )

 endif
 
 endif
 

+CompareKernelPatchVer=$(if $(call kernel_version_cmp,-$(2),$(1),$(3)),1,0)
+
+kernel_patchver_gt=$(call kernel_version_cmp,-gt,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_ge=$(call kernel_version_cmp,-ge,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_eq=$(call kernel_version_cmp,-eq,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_le=$(call kernel_version_cmp,-lt,$(KERNEL_PATCHVER),$(1))
+kernel_patchver_lt=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1))
+