浏览代码

make ModuleAutoLoad more readable

When doing a build with tracing on, the expansion of ModuleAutoLoad can get a
little hairy.

Using intermediate variables to name the arguments makes tracing more readable.

One side effect is that if an argument is accidentally left out, we won't get
all of the parameters shifted one over thanks to quoting (done in AutoLoad).

Signed-of-by: Philip Prindeville <[email protected]>

SVN-Revision: 23513
Florian Fainelli 15 年之前
父节点
当前提交
8a6ee777b0
共有 1 个文件被更改,包括 10 次插入6 次删除
  1. 10 6
      include/kernel.mk

+ 10 - 6
include/kernel.mk

@@ -67,16 +67,20 @@ define ModuleAutoLoad
 	$(SH_FUNC) \
 	$(SH_FUNC) \
 	export modules=; \
 	export modules=; \
 	add_module() { \
 	add_module() { \
+		priority="$$$$$$$$1"; \
+		mods="$$$$$$$$2"; \
+		boot="$$$$$$$$3"; \
+		shift 3; \
 		mkdir -p $(2)/etc/modules.d; \
 		mkdir -p $(2)/etc/modules.d; \
 		( \
 		( \
-			[ "$$$$$$$$3" = "1" ] && { \
+			[ "$$$$$$$$boot" = "1" ] && { \
 				echo '# May be required for rootfs' ; \
 				echo '# May be required for rootfs' ; \
 			} ; \
 			} ; \
-			for mod in $$$$$$$$2; do \
-				getvar mod; \
+			for mod in $$$$$$$$mods; do \
+				echo "$$$$$$$$mod"; \
 			done \
 			done \
-		) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
-		modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
+		) > $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
+		modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \
 	}; \
 	}; \
 	$(3) \
 	$(3) \
 	if [ -n "$$$$$$$$modules" ]; then \
 	if [ -n "$$$$$$$$modules" ]; then \
@@ -156,7 +160,7 @@ $(call KernelPackage/$(1)/config)
 endef
 endef
 
 
 define AutoLoad
 define AutoLoad
-  add_module $(1) "$(2)" $(3);
+  add_module "$(1)" "$(2)" "$(3)";
 endef
 endef
 
 
 ifdef DUMP
 ifdef DUMP