aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-08-26 13:26:02 +0000
committerNicolas Thill <nico@openwrt.org>2007-08-26 13:26:02 +0000
commitb35e6fe3bad807e9a8fcb00d4b916c1b8480b982 (patch)
treed24eeeb1cdf31a86a48e6a1ece200e6c9bcfe1dc
parenta2b4d75799a33d37b09d2ff1d954ec9a1aadac5b (diff)
downloadupstream-b35e6fe3bad807e9a8fcb00d4b916c1b8480b982.tar.gz
upstream-b35e6fe3bad807e9a8fcb00d4b916c1b8480b982.tar.bz2
upstream-b35e6fe3bad807e9a8fcb00d4b916c1b8480b982.zip
include kernel-version.mk from kernel.mk so that a correct KERNEL_PATCHVER is always available
SVN-Revision: 8494
-rw-r--r--include/kernel-build.mk1
-rw-r--r--include/kernel.mk2
-rw-r--r--toolchain/kernel-headers/Makefile1
3 files changed, 2 insertions, 2 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 8750bb4fd5..0d3b40e16f 100644
--- 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 817555cf0f..b148ae9e87 100644
--- 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 011ec959c8..cb7ed491e2 100644
--- 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)