Messages in this thread Patch in this message | | | From | Jessica Yu <> | Subject | [PATCH 4/4] scripts/nsdeps: make sure to pass all module source files to spatch | Date | Mon, 28 Oct 2019 16:14:27 +0100 |
| |
The nsdeps script passes a list of the module source files to generate_deps_for_ns() as a space delimited string named $mod_source_files, which then passes it to spatch. But since $mod_source_files is not encased in quotes, each source file in that string is treated as a separate shell function argument (as $2, $3, $4, etc.). However, the spatch invocation only refers to $2, so only the first file out of $mod_source_files is processed by spatch.
This causes problems (namely, the MODULE_IMPORT_NS() statement doesn't get inserted) when a module is composed of many source files and the "main" module file containing the MODULE_LICENSE() statement is not the first file listed in $mod_source_files. Fix this by encasing $mod_source_files in quotes so that the entirety of the string is treated as a single argument and can be referred to as $2.
Signed-off-by: Jessica Yu <jeyu@kernel.org> --- scripts/nsdeps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/nsdeps b/scripts/nsdeps index 9ddcd5cb96b1..5055b059a81b 100644 --- a/scripts/nsdeps +++ b/scripts/nsdeps @@ -36,7 +36,7 @@ generate_deps() { | sed -E "s%(^|\s)([^/][^ ]*)%\1$srctree/\2%g"` for ns in `cat $ns_deps_file`; do echo "Adding namespace $ns to module $mod_name (if needed)." - generate_deps_for_ns $ns $mod_source_files + generate_deps_for_ns $ns "$mod_source_files" # sort the imports for source_file in $mod_source_files; do sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp -- 2.16.4
| |