ar71xx: merge DSA switch patch

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

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index ee3486f..05c3691 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -1,27 +1,40 @@
 # Use the default kernel version if the Makefile doesn't override it
 
 # Use the default kernel version if the Makefile doesn't override it
 

-ifeq ($(LINUX_VERSION),)
-  ifeq ($(KERNEL),2.4)
-    LINUX_VERSION:=2.4.34
-  else
-    LINUX_VERSION:=2.6.21.5
-  endif
+ifeq ($(KERNEL),2.4)
+  LINUX_VERSION?=2.4.37.5
+else
+  LINUX_VERSION?=2.6.21.7

 endif
 LINUX_RELEASE?=1
 
 endif
 LINUX_RELEASE?=1
 

-ifeq ($(LINUX_VERSION),2.4.34)
-  LINUX_KERNEL_MD5SUM:=f59665540a7f3351ea416a0dad104b55
+ifeq ($(LINUX_VERSION),2.4.37.5)
+  LINUX_KERNEL_MD5SUM:=cb221187422acaf6c63a40c646e5e476

 endif
 endif

-ifeq ($(LINUX_VERSION),2.6.22.4)
-  LINUX_KERNEL_MD5SUM:=6cf83acf21e65dcea4a5170c0bbc7125
+ifeq ($(LINUX_VERSION),2.6.21.7)
+  LINUX_KERNEL_MD5SUM:=bc15fad1487336d5dcb0945cd039d8ed

 endif
 endif

-ifeq ($(LINUX_VERSION),2.6.21.5)
-  LINUX_KERNEL_MD5SUM:=2e9a302b5d514b231640227d6a2ab7bf
+ifeq ($(LINUX_VERSION),2.6.25.20)
+  LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114
+endif
+ifeq ($(LINUX_VERSION),2.6.28.10)
+  LINUX_KERNEL_MD5SUM:=c4efb2c494d749cb5de274f8ae41c3fa
+endif
+ifeq ($(LINUX_VERSION),2.6.30.10)
+  LINUX_KERNEL_MD5SUM:=eb6be465f914275967a5602cb33662f5
+endif
+ifeq ($(LINUX_VERSION),2.6.31.7)
+  LINUX_KERNEL_MD5SUM:=ae93db04f169f35c98e786f25e84c237
+endif
+ifeq ($(LINUX_VERSION),2.6.32)
+  LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879

 endif
 
 # disable the md5sum check for unknown kernel versions
 LINUX_KERNEL_MD5SUM?=x
 
 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,$(KERNEL_BASE))))