X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fkernel.mk;h=9792d04d0dd1a3a88c003f95791cb69784cea04b;hb=947ca6f4e8cf3e67ce50d0af0f669e1099d6ea8c;hp=2611828a3cc145db3115bd59d4d8bc37a3f0b6e0;hpb=56574ceb396a26315114e5ddb37cbc41f79b3030;p=openwrt-10.03%2F.git

diff --git a/include/kernel.mk b/include/kernel.mk
index 2611828a3..9792d04d0 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -4,29 +4,14 @@
 # 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>
+  KERNEL?=<KERNEL>
+  BOARD?=<BOARD>
+  LINUX_VERSION?=<LINUX_VERSION>
 else
-
-  include $(TOPDIR)/.kernel.mk
   include $(INCLUDE_DIR)/target.mk
 
-  # check to see if .kernel.mk matches target.mk
-  ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL))
-     LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
-     LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE)
-     LINUX_KARCH:=$(CONFIG_LINUX_KARCH)
-  else
-    ifneq ($(KERNEL_BUILD),1)
-      # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
-      $(warning rebuilding .kernel.mk)
-      $(TOPDIR)/.kernel.mk: FORCE
-		@$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null
-    endif
-  endif
-
   ifeq ($(KERNEL),2.6)
     LINUX_KMOD_SUFFIX=ko
   else
@@ -41,6 +26,8 @@ else
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 
+  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
+  GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
   KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
   LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
@@ -49,6 +36,15 @@ else
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
+
+  LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+  LINUX_SITE:=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
+           http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
+           http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
+           http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
+
+  PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 endif
 
 
@@ -83,6 +79,7 @@ endef
 
 define KernelPackage
   NAME:=$(1)
+  $(eval $(call Package/Default))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
@@ -92,9 +89,9 @@ define KernelPackage
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
-    DEFAULT:=m
+    DEFAULT:=$(KMOD_DEFAULT)
     DESCRIPTION:=$(DESCRIPTION)
-    EXTRA_DEPENDS:='kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))'
+    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
@@ -104,7 +101,7 @@ define KernelPackage
     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install
 		mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
-		$(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
+		$(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
 		$(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
 		$(call KernelPackage/$(1)/install,$$(1))
       endef