X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9546b789a5d7a0aa04b4845fce744e4e11e7f398..0a2b2965cd687a2be744552b09f4f5cf2fde4c0f:/include/kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 63df959a4..6795bd49f 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -16,11 +16,7 @@ ifeq ($(DUMP),1)
 else
   export GCC_HONOUR_COPTS=s
 
-  ifeq ($(KERNEL),2.6)
-    LINUX_KMOD_SUFFIX=ko
-  else
-    LINUX_KMOD_SUFFIX=o
-  endif
+  LINUX_KMOD_SUFFIX=ko
 
   ifneq (,$(findstring uml,$(BOARD)))
     KERNEL_CC?=$(HOSTCC)
@@ -68,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 \
@@ -159,7 +160,7 @@ $(call KernelPackage/$(1)/config)
 endef
 
 define AutoLoad
-  add_module $(1) "$(2)" $(3);
+  add_module "$(1)" "$(2)" "$(3)";
 endef
 
 ifdef DUMP