fix uml-2.6 (closes: #678)

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

diff --git a/include/kernel.mk b/include/kernel.mk
index 5c64ee4e12cb9f21ff4902737327ba1531eadbcb..db02ea2160e5727156d99da7e2fceeaf00b74f90 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -1,7 +1,16 @@
-ifneq ($(DUMP),1)
-include $(TOPDIR)/.kernel.mk
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+ifeq ($(DUMP),1)
+  KERNEL:=<KERNEL>
+  BOARD:=<BOARD>
+  LINUX_VERSION:=<LINUX_VERSION>
+else
+-include $(TOPDIR)/.kernel.mk
 
-KERNEL:=unknown
 ifneq (,$(findstring 2.4.,$(LINUX_VERSION)))
 KERNEL:=2.4
 LINUX_KMOD_SUFFIX=o
@@ -19,6 +28,15 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/armeb/arm/' \
 )
 
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=um
+  KERNEL_CC:=$(HOSTCC)
+  KERNEL_CROSS:=
+else
+  KERNEL_CC:=$(TARGET_CC)
+  KERNEL_CROSS:=$(TARGET_CROSS)
+endif
+
 KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
@@ -44,10 +62,10 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_
 I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2)
 
 ifeq ($$(KDEPEND_$(1)),m)
-ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),)
+ifneq ($$(CONFIG_PACKAGE_KMOD_$(1)),)
 TARGETS += $$(PKG_$(1))
 endif
-ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y)
+ifeq ($$(CONFIG_PACKAGE_KMOD_$(1)),y)
 INSTALL_TARGETS += $$(PKG_$(1))
 endif
 endif