On 10/17/10 5:50 AM, Florian Fainelli wrote:
Hi,
Le Saturday 9 October 2010 20:59:48, Philip Prindeville a écrit :
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]>
This patch looks correct to me, however I could not get it to apply:
patching file include/kernel.mk
Hunk #1 FAILED at 67.
Hunk #2 FAILED at 156.
2 out of 2 hunks FAILED -- saving rejects to file include/kernel.mk.rej
--
Florian
Here it is again, as an attachment (because I use TB 3.1). Thanks.
Index: include/kernel.mk
===================================================================
--- include/kernel.mk (revision 23109)
+++ include/kernel.mk (working copy)
@@ -67,16 +67,20 @@
$(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 +161,7 @@
endef
define AutoLoad
- add_module $(1) "$(2)" $(3);
+ add_module "$(1)" "$(2)" "$(3)";
endef
ifdef DUMP
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
