mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 21:24:08 +08:00
bbc55bded4
The modpost, with the -d option given, generates per-module .ns_deps files. Kbuild generates per-module .mod files to carry module information. This is convenient because Make handles multiple jobs in parallel when the -j option is given. On the other hand, the modpost always runs as a single thread. I do not see a strong reason to produce separate .ns_deps files. This commit changes the modpost to generate just one file, modules.nsdeps, each line of which has the following format: <module_name>: <list of missing namespaces> Please note it contains *missing* namespaces instead of required ones. So, modules.nsdeps is empty if the namespace dependency is all good. This will work more efficiently because spatch will no longer process already imported namespaces. I removed the '(if needed)' from the nsdeps log since spatch is invoked only when needed. This also solves the stale .ns_deps problem reported by Jessica Yu: https://lkml.org/lkml/2019/10/28/467 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Jessica Yu <jeyu@kernel.org> Acked-by: Jessica Yu <jeyu@kernel.org> Reviewed-by: Matthias Maennich <maennich@google.com> Tested-by: Matthias Maennich <maennich@google.com>
58 lines
1.8 KiB
Bash
58 lines
1.8 KiB
Bash
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
# Linux kernel symbol namespace import generator
|
|
#
|
|
# This script requires a minimum spatch version.
|
|
SPATCH_REQ_VERSION="1.0.4"
|
|
|
|
DIR="$(dirname $(readlink -f $0))/.."
|
|
SPATCH="`which ${SPATCH:=spatch}`"
|
|
if [ ! -x "$SPATCH" ]; then
|
|
echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/'
|
|
exit 1
|
|
fi
|
|
|
|
SPATCH_REQ_VERSION_NUM=$(echo $SPATCH_REQ_VERSION | ${DIR}/scripts/ld-version.sh)
|
|
SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
|
|
SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh)
|
|
|
|
if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then
|
|
echo "spatch needs to be version $SPATCH_REQ_VERSION or higher"
|
|
exit 1
|
|
fi
|
|
|
|
generate_deps_for_ns() {
|
|
$SPATCH --very-quiet --in-place --sp-file \
|
|
$srctree/scripts/coccinelle/misc/add_namespace.cocci -D ns=$1 $2
|
|
}
|
|
|
|
generate_deps() {
|
|
local mod=${1%.ko:}
|
|
shift
|
|
local namespaces="$*"
|
|
local mod_source_files="`cat $mod.mod | sed -n 1p \
|
|
| sed -e 's/\.o/\.c/g' \
|
|
| sed "s|[^ ]* *|${srctree}/&|g"`"
|
|
for ns in $namespaces; do
|
|
echo "Adding namespace $ns to module $mod.ko."
|
|
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
|
|
offset=$(wc -l ${source_file}.tmp | awk '{print $1;}')
|
|
cat $source_file | grep MODULE_IMPORT_NS | LANG=C sort -u >> ${source_file}.tmp
|
|
tail -n +$((offset +1)) ${source_file} | grep -v MODULE_IMPORT_NS >> ${source_file}.tmp
|
|
if ! diff -q ${source_file} ${source_file}.tmp; then
|
|
mv ${source_file}.tmp ${source_file}
|
|
else
|
|
rm ${source_file}.tmp
|
|
fi
|
|
done
|
|
done
|
|
}
|
|
|
|
while read line
|
|
do
|
|
generate_deps $line
|
|
done < modules.nsdeps
|