package/busybox: add 3 upstream fixes, bump release number

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

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9a91d6b..284b963 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -1,26 +1,47 @@
 # 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.9

 endif
 LINUX_RELEASE?=1
 
 endif
 LINUX_RELEASE?=1
 

-ifeq ($(LINUX_VERSION),2.4.34)
-  LINUX_KERNEL_MD5SUM:=f59665540a7f3351ea416a0dad104b55
+ifeq ($(LINUX_VERSION),2.4.37.9)
+  LINUX_KERNEL_MD5SUM:=b85b8962840c13f17f944e7b1890f8f8

 endif
 endif

-ifeq ($(LINUX_VERSION),2.6.22.1)
-  LINUX_KERNEL_MD5SUM:=50249e822a2a112d9221129a4a3af374
+ifeq ($(LINUX_VERSION),2.6.25.20)
+  LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114

 endif
 endif

-ifeq ($(LINUX_VERSION),2.6.21.5)
-  LINUX_KERNEL_MD5SUM:=2e9a302b5d514b231640227d6a2ab7bf
+ifeq ($(LINUX_VERSION),2.6.30.10)
+  LINUX_KERNEL_MD5SUM:=eb6be465f914275967a5602cb33662f5
+endif
+ifeq ($(LINUX_VERSION),2.6.31.12)
+  LINUX_KERNEL_MD5SUM:=517be354b81b780e2f4b2ad614d030de
+endif
+ifeq ($(LINUX_VERSION),2.6.32.10)
+  LINUX_KERNEL_MD5SUM:=5d996507ad482a3a8c8e6b2d48e7994b
+endif
+ifeq ($(LINUX_VERSION),2.6.32.11)
+  LINUX_KERNEL_MD5SUM:=3709c691d909b4f8ca692edc6c726cb6
+endif
+ifeq ($(LINUX_VERSION),2.6.33)
+  LINUX_KERNEL_MD5SUM:=c3883760b18d50e8d78819c54d579b00
+endif
+ifeq ($(LINUX_VERSION),2.6.33.1)
+  LINUX_KERNEL_MD5SUM:=73b514ec918b88a45656be191b1ee226
+endif
+ifeq ($(LINUX_VERSION),2.6.33.2)
+  LINUX_KERNEL_MD5SUM:=80c5ff544b0ee4d9b5d8b8b89d4a0ef9
+endif
+ifeq ($(LINUX_VERSION),2.6.34-rc4)
+  LINUX_KERNEL_MD5SUM:=45b185f33300bbd69034779748b52c5f

 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))))
+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))))