Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'modules-for-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules fix from Jessica Yu:
"Fix `make nsdeps` for modules composed of multiple source files.
Since $mod_source_files was not in quotes in the call to
generate_deps_for_ns(), not all the source files for a module were
being passed to spatch"
* tag 'modules-for-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
scripts/nsdeps: make sure to pass all module source files to spatch
+3
-3
+3
-3
scripts/nsdeps
+3
-3
scripts/nsdeps
···
31
31
local mod_file=`echo $@ | sed -e 's/\.ko/\.mod/'`
32
32
local ns_deps_file=`echo $@ | sed -e 's/\.ko/\.ns_deps/'`
33
33
if [ ! -f "$ns_deps_file" ]; then return; fi
34
-
local mod_source_files=`cat $mod_file | sed -n 1p \
34
+
local mod_source_files="`cat $mod_file | sed -n 1p \
35
35
| sed -e 's/\.o/\.c/g' \
36
-
| sed "s|[^ ]* *|${srctree}/&|g"`
36
+
| sed "s|[^ ]* *|${srctree}/&|g"`"
37
37
for ns in `cat $ns_deps_file`; do
38
38
echo "Adding namespace $ns to module $mod_name (if needed)."
39
-
generate_deps_for_ns $ns $mod_source_files
39
+
generate_deps_for_ns $ns "$mod_source_files"
40
40
# sort the imports
41
41
for source_file in $mod_source_files; do
42
42
sed '/MODULE_IMPORT_NS/Q' $source_file > ${source_file}.tmp