revert [8415], seems to be causing problems for the kernel build

[openwrt.git] / package / kernel / Makefile

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index bc0b88b..3ec07d4 100644 (file)
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -14,10 +14,7 @@ PKG_VERSION:=$(LINUX_VERSION)-$(BOARD)
 PKG_RELEASE:=$(LINUX_RELEASE)
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
 PKG_RELEASE:=$(LINUX_RELEASE)
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages

-PKG_FILE_DEPEND:=$(MODULES_DIR)
-
-# build all in-tree kmod-* packages by default
-KMOD_DEFAULT:=m
+SCAN_DEPS=modules/*.mk

 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)


@@ -50,13 +47,7 @@ define Package/kernel/install
   # nothing to do
 endef
 
   # nothing to do
 endef
 

-# this is more robust than ifdef around eval/call
-ifneq ($(DUMP),1)
-  define BuildKernel
-    $(call BuildPackage,kernel)
-  endef
-endif
-$(eval $(call BuildKernel))
+$(eval $(if $(DUMP),,$(call BuildPackage,kernel)))

 
 include $(TOPDIR)/target/linux/*/modules.mk
 include ./modules/*.mk
 
 include $(TOPDIR)/target/linux/*/modules.mk
 include ./modules/*.mk