From 83790f74ad846ab2a50c71fab34a2d7755df4a95 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 18 Apr 2007 12:28:38 +0000
Subject: Improved autorebuild for kernel related stuff. - make modules_install
 in the kernel tree is no longer called - make modules is called on every
 target/compile run - kmod packages pull the kernel modules directly out of
 the kernel tree and have proper file depends on them

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6998 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/kernel-build.mk    | 2 +-
 include/kernel-defaults.mk | 1 -
 include/kernel.mk          | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 155a542f3..9037b5ced 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -92,7 +92,7 @@ define BuildKernel
 	$(call Kernel/Configure)
 	touch $$@
 
-  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured $(LINUX_DIR)/.config
+  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured $(LINUX_DIR)/.config FORCE
 	$(call Kernel/CompileModules)
 	touch $$@
 
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 3469cff20..f80959a4f 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -56,7 +56,6 @@ endef
 
 define Kernel/CompileModules/Default
 	$(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" modules
-	$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
 endef
 
 ifeq ($(KERNEL),2.6)
diff --git a/include/kernel.mk b/include/kernel.mk
index 9792d04d0..119de8687 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -32,7 +32,6 @@ else
   LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
-  MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR)
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
@@ -108,6 +107,8 @@ define KernelPackage
     endif
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
+
+  $$(IPKG_kmod-$(1)): $$(FILES)
 endef
 
 define AutoLoad
-- 
cgit v1.2.3