include kernel-version.mk from kernel.mk so that a correct KERNEL_PATCHVER is always...

SVN-Revision: 8494

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 8750bb4fd52487b98dfb6d24cabb7ddbc749cf7a..0d3b40e16f44f73fcaf5e05b9c36876dd79200b6 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -6,7 +6,6 @@
 #
 KERNEL_BUILD:=1
 
-include $(INCLUDE_DIR)/kernel-version.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/prereq.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 817555cf0f629584a1395b9439d5785db4c14084..b148ae9e8791138aba60ff4f75533be1809dda5e 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -5,6 +5,8 @@
 # See /LICENSE for more information.
 #
 
+include $(INCLUDE_DIR)/kernel-version.mk
+
 ifeq ($(DUMP),1)
   KERNEL?=<KERNEL>
   BOARD?=<BOARD>

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 011ec959c866081ebcf2ce2c3ef93eaccbf473e5..cb7ed491e26d2ba86b66adb052bc29e5d6dd3aea 100644 (file)
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -14,7 +14,6 @@ BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 override QUILT:=
 
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/kernel-version.mk
 
 PKG_NAME:=linux
 PKG_VERSION:=$(LINUX_VERSION)