imagebuilder: various fixes

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

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index e481a32..e4f0b48 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -1,43 +1,38 @@
 # Use the default kernel version if the Makefile doesn't override it
 
 ifeq ($(KERNEL),2.4)
 # Use the default kernel version if the Makefile doesn't override it
 
 ifeq ($(KERNEL),2.4)

-  LINUX_VERSION?=2.4.35.4
-else
-  LINUX_VERSION?=2.6.21.7
+  LINUX_VERSION?=2.4.37.9

 endif
 LINUX_RELEASE?=1
 
 endif
 LINUX_RELEASE?=1
 

-ifeq ($(LINUX_VERSION),2.4.34)
-  LINUX_KERNEL_MD5SUM:=f59665540a7f3351ea416a0dad104b55
-endif
-ifeq ($(LINUX_VERSION),2.4.35.4)
-  LINUX_KERNEL_MD5SUM:=34066faff3d8c042df1c7600b08b8070
-endif
-ifeq ($(LINUX_VERSION),2.6.21.7)
-  LINUX_KERNEL_MD5SUM:=bc15fad1487336d5dcb0945cd039d8ed
-endif
-ifeq ($(LINUX_VERSION),2.6.23.17)
-  LINUX_KERNEL_MD5SUM:=a0300a393ac91ce9c64bf31522b45e2e
-endif
-ifeq ($(LINUX_VERSION),2.6.24.7)
-  LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
+ifeq ($(LINUX_VERSION),2.4.37.9)
+  LINUX_KERNEL_MD5SUM:=b85b8962840c13f17f944e7b1890f8f8

 endif
 ifeq ($(LINUX_VERSION),2.6.25.20)
   LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114
 endif
 endif
 ifeq ($(LINUX_VERSION),2.6.25.20)
   LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114
 endif

-ifeq ($(LINUX_VERSION),2.6.26.8)
-  LINUX_KERNEL_MD5SUM:=05dd0d4f8f110b4219ae6ec7a36c046d
+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
 endif

-ifeq ($(LINUX_VERSION),2.6.27.15)
-  LINUX_KERNEL_MD5SUM:=0756284efb091dccd012eec61def2004
+ifeq ($(LINUX_VERSION),2.6.33)
+  LINUX_KERNEL_MD5SUM:=c3883760b18d50e8d78819c54d579b00

 endif
 endif

-ifeq ($(LINUX_VERSION),2.6.28.2)
-  LINUX_KERNEL_MD5SUM:=8fce853ebfe658f0833d34bb1dc14d86
+ifeq ($(LINUX_VERSION),2.6.33.1)
+  LINUX_KERNEL_MD5SUM:=73b514ec918b88a45656be191b1ee226

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