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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8494 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 8750bb4..0d3b40e 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 817555c..b148ae9 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 011ec95..cb7ed49 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)