port over the netfilter module packaging to the new system and fix iptables dependencies

[openwrt.git] / package / kernel / Makefile

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index f3a9a28..39978ab 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
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
 -include $(LINUX_DIR)/.config

+NF_KMOD:=1

 include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 include $(INCLUDE_DIR)/netfilter.mk
 endif
 


@@ -30,7 +31,7 @@ endef
 
 define KernelPackage/Defaults
 FILES:=
 
 define KernelPackage/Defaults
 FILES:=

-KCONFIG:=
+KCONFIG:=m

 AUTOLOAD:=
 endef
 
 AUTOLOAD:=
 endef
 


@@ -42,14 +43,14 @@ define ModuleAutoLoad
                modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
        }; \
        $(3) \
                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; \
                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
  
 
 endef
  
 


@@ -67,8 +68,11 @@ define KernelPackage
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules

+    DEFAULT:=m

     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:='kernel (=$(PKG_VERSION))'
     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:='kernel (=$(PKG_VERSION))'

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

   endef
 
   define Package/kmod-$(1)/install
   endef
 
   define Package/kmod-$(1)/install