X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3ca168b4e7354bba338b7484c15d37c877bb126a..91ef5b68e237e3d9e4a90f43427e55ab35928aa3:/package/kernel/Makefile diff --git a/package/kernel/Makefile b/package/kernel/Makefile index e5094ef01..bb9fd4f70 100644 --- 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_RELEASE:=1 +PKG_RELEASE:=$(LINUX_RELEASE) 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 @@ -30,9 +30,9 @@ define Build/Compile endef define KernelPackage/Defaults -FILES:= -KCONFIG:=m -AUTOLOAD:= + FILES:= + KCONFIG:=m + AUTOLOAD:= endef define ModuleAutoLoad @@ -66,26 +66,25 @@ define KernelPackage 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 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)) - endef - endif + endef + endif endif $$(eval $$(call BuildPackage,kmod-$(1))) endef define AutoLoad -add_module $(1) "$(2)"; + add_module $(1) "$(2)"; endef include ./modules.mk -