History

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.

Masahiro Yamada committed 7 years ago

Commit bc35d4b1 parent bbc55bd4 files · +14 −4Browse files

Showing the changes to scripts (2 of 4 files). Show all

Unified · Split

2 files
  1. scripts/Makefile.modpost +1 −1
  2. scripts/nsdeps +8 −2
scripts/Makefile.modpost+1−1
@@ -66,7 +66,7 @@ __modpost: · 65 unmodified lines
6666 else
6767
6868 MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - \
69− $(if $(KBUILD_NSDEPS),-d modules.nsdeps)
69+ $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))
7070
7171 ifeq ($(KBUILD_EXTMOD),)
7272 MODPOST += $(wildcard vmlinux)
scripts/nsdeps+8−2
@@ -21,6 +21,12 @@ if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then · 20 unmodified lines
2121 exit 1
2222 fi
2323
24+if [ "$KBUILD_EXTMOD" ]; then
25+ src_prefix=
26+else
27+ src_prefix=$srctree/
28+fi
29+
2430 generate_deps_for_ns() {
2531 $SPATCH --very-quiet --in-place --sp-file \
2632 $srctree/scripts/coccinelle/misc/add_namespace.cocci -D ns=$1 $2
@@ -32,7 +38,7 @@ generate_deps() { · 5 unmodified lines
3238 local namespaces="$*"
3339 local mod_source_files="`cat $mod.mod | sed -n 1p \
3440 | sed -e 's/\.o/\.c/g' \
35− | sed "s|[^ ]* *|${srctree}/&|g"`"
41+ | sed "s|[^ ]* *|${src_prefix}&|g"`"
3642 for ns in $namespaces; do
3743 echo "Adding namespace $ns to module $mod.ko."
3844 generate_deps_for_ns $ns "$mod_source_files"
@@ -54,4 +60,4 @@ generate_deps() { · 15 unmodified lines
5460 while read line
5561 do
5662 generate_deps $line
57−done < modules.nsdeps
63+done < $MODULES_NSDEPS