fix KERNEL_PATCHVER for rc kernels

[openwrt/openwrt.git] / include / kernel-version.mk

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 45139a6a7765ee0e139fc8deb4666d72dc15c9ad..c3e3e140a043ad0ab40b3cd771949b0738bee0e1 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -38,6 +38,9 @@ endif
 # disable the md5sum check for unknown kernel versions
 LINUX_KERNEL_MD5SUM?=x
 
-KERNEL?=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION))))
-KERNEL_PATCHVER=$(shell echo '$(LINUX_VERSION)' | cut -d. -f1,2,3 | cut -d- -f1)
+split_version=$(subst ., ,$(1))
+merge_version=$(subst $(space),.,$(1))
+KERNEL_BASE=$(firstword $(subst -, ,$(LINUX_VERSION)))
+KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE))))
+KERNEL_PATCHVER=$(call merge_version,$(wordlist 1,3,$(call split_version,$(LINUX_VERSION))))