scripts/nsdeps: make sure to pass all module source files to spatch
PATCH v2 1/1 scripts/nsdeps: make sure to pass all module source files to spatch
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.
In addition, put quotes in the variable assignment of mod_source_files to prevent any shell interpretation and field splitting.
---
v2: put quotes around mod_source_files variable assignment as suggested by Masahiro.
scripts/nsdeps | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/nsdeps +3 -3
@@ -31,12 +31,12 @@ generate_deps() { local mod_file=`echo $@ | sed -e 's/\.ko/\.mod/'` local ns_deps_file=`echo $@ | sed -e 's/\.ko/\.ns_deps/'` if [ ! -f "$ns_deps_file" ]; then return; fi - local mod_source_files=`cat $mod_file | sed -n 1p \ + local mod_source_files="`cat $mod_file | sed -n 1p \ | sed -e 's/\.o/\.c/g' \ - | sed "s|[^ ]* *|${srctree}/&|g"` + | sed "s|[^ ]* *|${srctree}/&|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
Signature · 1 line
2.16.4
Quoted 16 lines · Jessica Yu
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 theMODULE_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.
Quoted 5 lines
In addition, put quotes in the variable assignment of
mod_source_filesto prevent any shell interpretation and field splitting.Signed-off-by Jessica Yu <[email protected]>---
Quoted 29 lines
v2: put quotes around
mod_source_filesvariable assignment as suggested by Masahiro.scripts/nsdeps | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)scripts/nsdeps +3
-4@@ -31,12 +31,12 @@ generate_deps() { local mod_file=`echo $@ | sed -e 's/\.ko/\.mod/'` local ns_deps_file=`echo $@ | sed -e 's/\.ko/\.ns_deps/'` if [ ! -f "$ns_deps_file" ]; then return; fi - local mod_source_files=`cat $mod_file | sed -n 1p \ + local mod_source_files="`cat $mod_file | sed -n 1p \ | sed -e 's/\.o/\.c/g' \ - | sed "s|[^ ]* *|${srctree}/&|g"` + | sed "s|[^ ]* *|${srctree}/&|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
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 15 lines · Jessica Yu
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 theMODULE_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.
Quoted 5 lines
In addition, put quotes in the variable assignment of
mod_source_filesto prevent any shell interpretation and field splitting.Signed-off-by Jessica Yu <[email protected]>---
Thanks for fixing this!
Cheers,
Matthias
Quoted 29 lines
v2: put quotes around
mod_source_filesvariable assignment as suggested by Masahiro.
scripts/nsdeps| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)scripts/nsdeps +3
-3@@ -31,12 +31,12 @@ generate_deps() { local mod_file=`echo $@ | sed -e 's/\.ko/\.mod/'` local ns_deps_file=`echo $@ | sed -e 's/\.ko/\.ns_deps/'` if [ ! -f "$ns_deps_file" ]; then return; fi - local mod_source_files=`cat $mod_file | sed -n 1p \ + local mod_source_files="`cat $mod_file | sed -n 1p \ | sed -e 's/\.o/\.c/g' \ - | sed "s|[^ ]* *|${srctree}/&|g"` + | sed "s|[^ ]* *|${srctree}/&|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}.tmpSignature · 1 line
2.16.4