diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-01 18:08:17 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-01 18:08:17 +0000 |
| commit | f9794518c7a41ffd1e962d77e1fd2b94cf9da9f7 (patch) | |
| tree | 5e98e966b4675de28ebe849cf095d868db773209 | |
| parent | 8f120f03efc2e280852c9018ea608a0b089ded4d (diff) | |
kernel.mk: add a new helper for comparing kernel versions, which can take 1 - 4 field kernel versions
implement CompareKernelPatchVer using this new helper
implement kernel_patchver_{gt,ge,eq,le,lt}, which are more convenient for use with inline $(if)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27087 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 5e8df444fb..e120cef1fa 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -161,11 +161,20 @@ define AutoLoad 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 - CompareKernelPatchVer=0 + kernel_version_cmp= 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 +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)) + |