diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-18 12:28:38 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-18 12:28:38 +0000 |
commit | 83790f74ad846ab2a50c71fab34a2d7755df4a95 (patch) | |
tree | e654d64992582dda9d38ce98a7f230c0e3424561 /include | |
parent | ce03b0650991e557e25fbd0cb1b2c6d3802671e2 (diff) |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/kernel-build.mk | 2 | ||||
-rw-r--r-- | include/kernel-defaults.mk | 1 | ||||
-rw-r--r-- | include/kernel.mk | 3 |
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 |