X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ae57d8838ce086c44a95b54816191ed9e92545b2..99a212a2565ed4c256d86645d14ff7064f284f2d:/include/kernel.mk?ds=sidebyside

diff --git a/include/kernel.mk b/include/kernel.mk
index 8bce6e351..6795bd49f 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -16,6 +16,8 @@ ifeq ($(DUMP),1)
 else
   export GCC_HONOUR_COPTS=s
 
+  LINUX_KMOD_SUFFIX=ko
+
   ifneq (,$(findstring uml,$(BOARD)))
     KERNEL_CC?=$(HOSTCC)
     KERNEL_CROSS?=
@@ -62,18 +64,23 @@ define KernelPackage/Defaults
 endef
 
 define ModuleAutoLoad
+	$(SH_FUNC) \
 	export modules=; \
 	add_module() { \
+		priority="$$$$$$$$1"; \
+		mods="$$$$$$$$2"; \
+		boot="$$$$$$$$3"; \
+		shift 3; \
 		mkdir -p $(2)/etc/modules.d; \
 		( \
-			[ "$$$$$$$$3" = "1" ] && { \
+			[ "$$$$$$$$boot" = "1" ] && { \
 				echo '# May be required for rootfs' ; \
 			} ; \
-			for mod in $$$$$$$$2; do \
-				getvar mod; \
+			for mod in $$$$$$$$mods; do \
+				echo "$$$$$$$$mod"; \
 			done \
-		) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
-		modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
+		) > $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
+		modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \
 	}; \
 	$(3) \
 	if [ -n "$$$$$$$$modules" ]; then \
@@ -153,7 +160,7 @@ $(call KernelPackage/$(1)/config)
 endef
 
 define AutoLoad
-  add_module $(1) "$(2)" $(3);
+  add_module "$(1)" "$(2)" "$(3)";
 endef
 
 ifdef DUMP