make sure a predefined CFLAGS variable does not get in the way (fix for #4038)

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

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index f68fdea..8602696 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -1,26 +1,37 @@
 # 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.35.4
+else
+  LINUX_VERSION?=2.6.21.7
 endif
 LINUX_RELEASE?=1
 
 ifeq ($(LINUX_VERSION),2.4.34)
   LINUX_KERNEL_MD5SUM:=f59665540a7f3351ea416a0dad104b55
 endif
-ifeq ($(LINUX_VERSION),2.6.22.4)
-  LINUX_KERNEL_MD5SUM:=6cf83acf21e65dcea4a5170c0bbc7125
+ifeq ($(LINUX_VERSION),2.4.35.4)
+  LINUX_KERNEL_MD5SUM:=34066faff3d8c042df1c7600b08b8070
 endif
-ifeq ($(LINUX_VERSION),2.6.21.5)
-  LINUX_KERNEL_MD5SUM:=2e9a302b5d514b231640227d6a2ab7bf
+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
+endif
+ifeq ($(LINUX_VERSION),2.6.25.16)
+  LINUX_KERNEL_MD5SUM:=fdb0e08f0e5a2b4fe6dc711ca35f430e
+endif
+ifeq ($(LINUX_VERSION),2.6.26.3)
+  LINUX_KERNEL_MD5SUM:=90fe36b18dbac6e2f79374e2df60ac67
 endif
 
 # disable the md5sum check for unknown kernel versions
 LINUX_KERNEL_MD5SUM?=x
 
-KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION))))
+KERNEL?=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION))))
+KERNEL_PATCHVER=$(shell echo '$(LINUX_VERSION)' | cut -d. -f1,2,3 | cut -d- -f1)