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 <philipp@redfish-solutions.com>

SVN-Revision: 23513
lede-17.01
Florian Fainelli 2010-10-18 06:58:11 +00:00
parent af0e5167bc
commit 8a6ee777b0
1 changed files with 10 additions and 6 deletions

View File

@ -67,16 +67,20 @@ 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 \
@ -156,7 +160,7 @@ $(call KernelPackage/$(1)/config)
endef
define AutoLoad
add_module $(1) "$(2)" $(3);
add_module "$(1)" "$(2)" "$(3)";
endef
ifdef DUMP