oops... another one

[openwrt.git] / package / kernel / Makefile

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 580bf19..b1155f4 100644 (file)
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -18,6 +18,7 @@ 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
 endif
 
@@ -30,7 +31,7 @@ endef
 
 define KernelPackage/Defaults
 FILES:=
-KCONFIG:=
+KCONFIG:=m
 AUTOLOAD:=
 endef
 
@@ -42,14 +43,14 @@ define ModuleAutoLoad
                modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
        }; \
        $(3) \
-       [ -n "$$$$$$$$modules" ] && { \
+       if [ -n "$$$$$$$$modules" ]; then \
                mkdir -p $(2)/etc/modules.d; \
                echo "#!/bin/sh" >> $(2)/CONTROL/postinst; \
                echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit" >> $(2)/CONTROL/postinst; \
                echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \
                echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \
                chmod 0755 $(2)/CONTROL/postinst; \
-       }
+       fi
 endef
  
 
@@ -59,23 +60,26 @@ define KernelPackage
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
 
-  ifneq ($(KCONFIG),m)
-    CONFIG_PACKAGE_kmod-$(1):=
-  endif
-
   define Package/kmod-$(1)
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
+    DEFAULT:=m
     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:='kernel (=$(PKG_VERSION))'
+    $(call KernelPackage/$(1))
+    $(call KernelPackage/$(1)/$(KERNEL))
   endef
 
-  define Package/kmod-$(1)/install
-       mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
-       $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
-  endef
+  ifeq ($(findstring m,$(KCONFIG)),m)
+  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))
+    endef
+  endif
+  endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
 endef