allow platform support directories to add and modify kernel module packages

[openwrt.git] / package / kernel / Makefile

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index b59649d..f755bed 100644 (file)
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -11,15 +11,15 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kernel
 PKG_VERSION:=$(LINUX_VERSION)-$(BOARD)
 
 PKG_NAME:=kernel
 PKG_VERSION:=$(LINUX_VERSION)-$(BOARD)

-PKG_RELEASE:=1
+PKG_RELEASE:=$(LINUX_RELEASE)

 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)

--include $(LINUX_DIR)/.config
-NF_KMOD:=1
-include $(INCLUDE_DIR)/netfilter.mk
+  -include $(LINUX_DIR)/.config
+  NF_KMOD:=1
+  include $(INCLUDE_DIR)/netfilter.mk

 endif
 
 define Build/Prepare
 endif
 
 define Build/Prepare


@@ -30,9 +30,9 @@ define Build/Compile
 endef
 
 define KernelPackage/Defaults
 endef
 
 define KernelPackage/Defaults

-FILES:=
-KCONFIG:=m
-AUTOLOAD:=
+  FILES:=
+  KCONFIG:=m
+  AUTOLOAD:=

 endef
 
 define ModuleAutoLoad
 endef
 
 define ModuleAutoLoad


@@ -59,6 +59,7 @@ define KernelPackage
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))

+  $(eval $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)))

 
   define Package/kmod-$(1)
     TITLE:=$(TITLE)
 
   define Package/kmod-$(1)
     TITLE:=$(TITLE)


@@ -69,23 +70,24 @@ define KernelPackage
     EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))'
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))'
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))

+    $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))

   endef
 
   ifeq ($(findstring m,$(KCONFIG)),m)
   endef
 
   ifeq ($(findstring m,$(KCONFIG)),m)

-  ifneq ($(strip $(FILES)),)
-    define Package/kmod-$(1)/install
+    ifneq ($(strip $(FILES)),)
+      define Package/kmod-$(1)/install

                mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
                $(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
                $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
                mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
                $(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
                $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))

-    endef
-  endif
+      endef
+    endif

   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
 endef
 
 define AutoLoad
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
 endef
 
 define AutoLoad

-add_module $(1) "$(2)";
+  add_module $(1) "$(2)";

 endef
 
 endef
 

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