init script cleanup, use /etc/rc.d/ for enabled scripts, /etc/init.d/<pkgname> (enabl...

[openwrt.git] / package / kernel / Makefile

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index f3a9a28..bb9fd4f 100644 (file)
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -11,14 +11,15 @@ include $(INCLUDE_DIR)/kernel.mk
 
 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),)
--include $(LINUX_DIR)/.config
-include $(INCLUDE_DIR)/netfilter.mk
+  -include $(LINUX_DIR)/.config
+  NF_KMOD:=1
+  include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 define Build/Prepare
@@ -29,9 +30,9 @@ define Build/Compile
 endef
 
 define KernelPackage/Defaults
-FILES:=
-KCONFIG:=
-AUTOLOAD:=
+  FILES:=
+  KCONFIG:=m
+  AUTOLOAD:=
 endef
 
 define ModuleAutoLoad
@@ -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 "#!/bin/sh" > $(2)/CONTROL/postinst; \
+               echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(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,29 +60,31 @@ define KernelPackage
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
 
-  ifneq ($(findstring m,$(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))'
+    EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))'
+    $(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
 
 define AutoLoad
-add_module $(1) "$(2)";
+  add_module $(1) "$(2)";
 endef
 
 include ./modules.mk
-