aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-04-18 12:28:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-04-18 12:28:38 +0000
commit4c6c987f09c6973bb49aa452aca8332f6e620d12 (patch)
treec9a979ef4473f55e9a33a1c8d58eef183b673993 /include
parenta3a9e039d87cbcd2efc47004e8bce099570a9020 (diff)
downloadupstream-4c6c987f09c6973bb49aa452aca8332f6e620d12.tar.gz
upstream-4c6c987f09c6973bb49aa452aca8332f6e620d12.tar.bz2
upstream-4c6c987f09c6973bb49aa452aca8332f6e620d12.zip
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
SVN-Revision: 6998
Diffstat (limited to 'include')
-rw-r--r--include/kernel-build.mk2
-rw-r--r--include/kernel-defaults.mk1
-rw-r--r--include/kernel.mk3
3 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 155a542f3d..9037b5ced0 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 3469cff200..f80959a4f2 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 9792d04d0d..119de8687e 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