X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel-version.mk;h=bb43e00b0bcef0e7bb6d7a1083a80fcf7d543827;hb=70461e261d85d9497a2a92b0778625a7470e9a57;hp=a6a7c6729c8d4e6f026b2022343219459ed46126;hpb=e86275357d076dc0f4c20a03b55b8904eaac6e30;p=openwrt.git

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index a6a7c6729c..bb43e00b0b 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -1,37 +1,23 @@
 # Use the default kernel version if the Makefile doesn't override it
 
-ifeq ($(KERNEL),2.4)
-  LINUX_VERSION?=2.4.37.4
-else
-  LINUX_VERSION?=2.6.21.7
-endif
 LINUX_RELEASE?=1
 
-ifeq ($(LINUX_VERSION),2.4.37.4)
-  LINUX_KERNEL_MD5SUM:=
-endif
-ifeq ($(LINUX_VERSION),2.6.21.7)
-  LINUX_KERNEL_MD5SUM:=bc15fad1487336d5dcb0945cd039d8ed
-endif
-ifeq ($(LINUX_VERSION),2.6.25.20)
-  LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114
-endif
-ifeq ($(LINUX_VERSION),2.6.27.28)
-  LINUX_KERNEL_MD5SUM:=f05cd17ba8ee19924c9c473219fbaa9b
-endif
-ifeq ($(LINUX_VERSION),2.6.28.10)
-  LINUX_KERNEL_MD5SUM:=c4efb2c494d749cb5de274f8ae41c3fa
-endif
-ifeq ($(LINUX_VERSION),2.6.30.3)
-  LINUX_KERNEL_MD5SUM:=5499e1fd246215d65fc7068cfb040406
-endif
+LINUX_VERSION-3.18 = .11
+LINUX_VERSION-4.0 = -rc7
 
-# disable the md5sum check for unknown kernel versions
-LINUX_KERNEL_MD5SUM?=x
+LINUX_KERNEL_MD5SUM-3.18.11 = 2def91951c9cedf7896efb864e0c090c
+LINUX_KERNEL_MD5SUM-4.0-rc7 = 26db663899b1a54397b4f184ca05f213
+
+ifdef KERNEL_PATCHVER
+  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
+endif
 
 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,$(KERNEL_BASE))))
+KERNEL_PATCHVER ?= $(KERNEL)
 
+# disable the md5sum check for unknown kernel versions
+LINUX_KERNEL_MD5SUM:=$(LINUX_KERNEL_MD5SUM-$(strip $(LINUX_VERSION)))
+LINUX_KERNEL_MD5SUM?=x