scripts/nsdeps: support nsdeps for external module builds
scripts/nsdeps is written to take care of only in-tree modules. Perhaps, this is not a bug, but just a design. At least, Documentation/core-api/symbol-namespaces.rst focuses on in-tree modules. Having said that, some people already tried nsdeps for external modules. So, it would be nice to support it. Reported-by: Steve French <smfrench@gmail.com> Reported-by: Jessica Yu <jeyu@kernel.org> 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>
This commit is contained in:
@@ -66,7 +66,7 @@ __modpost:
|
||||
else
|
||||
|
||||
MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - \
|
||||
$(if $(KBUILD_NSDEPS),-d modules.nsdeps)
|
||||
$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))
|
||||
|
||||
ifeq ($(KBUILD_EXTMOD),)
|
||||
MODPOST += $(wildcard vmlinux)
|
||||
|
@@ -21,6 +21,12 @@ if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$KBUILD_EXTMOD" ]; then
|
||||
src_prefix=
|
||||
else
|
||||
src_prefix=$srctree/
|
||||
fi
|
||||
|
||||
generate_deps_for_ns() {
|
||||
$SPATCH --very-quiet --in-place --sp-file \
|
||||
$srctree/scripts/coccinelle/misc/add_namespace.cocci -D ns=$1 $2
|
||||
@@ -32,7 +38,7 @@ generate_deps() {
|
||||
local namespaces="$*"
|
||||
local mod_source_files="`cat $mod.mod | sed -n 1p \
|
||||
| sed -e 's/\.o/\.c/g' \
|
||||
| sed "s|[^ ]* *|${srctree}/&|g"`"
|
||||
| sed "s|[^ ]* *|${src_prefix}&|g"`"
|
||||
for ns in $namespaces; do
|
||||
echo "Adding namespace $ns to module $mod.ko."
|
||||
generate_deps_for_ns $ns "$mod_source_files"
|
||||
@@ -54,4 +60,4 @@ generate_deps() {
|
||||
while read line
|
||||
do
|
||||
generate_deps $line
|
||||
done < modules.nsdeps
|
||||
done < $MODULES_NSDEPS
|
||||
|
Reference in New Issue
Block a user