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.
Unified · Split
| @@ -152,3 +152,6 @@ in-tree modules:: · 151 unmodified lines | ||
| 152 | 152 | - notice the warning of modpost telling about a missing import |
| 153 | 153 | - run `make nsdeps` to add the import to the correct code location |
| 154 | 154 | |
| 155 | +You can also run nsdeps for external module builds. A typical usage is:: | |
| 156 | + | |
| 157 | + $ make -C <path_to_kernel_src> M=$PWD nsdeps | |
| @@ -1008,6 +1008,7 @@ endif · 1007 unmodified lines | ||
| 1008 | 1008 | PHONY += prepare0 |
| 1009 | 1009 | |
| 1010 | 1010 | export MODORDER := $(extmod-prefix)modules.order |
| 1011 | +export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps | |
| 1011 | 1012 | |
| 1012 | 1013 | ifeq ($(KBUILD_EXTMOD),) |
| 1013 | 1014 | core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ |
| @@ -1620,7 +1621,7 @@ _emodinst_post: _emodinst_ · 606 unmodified lines | ||
| 1620 | 1621 | $(call cmd,depmod) |
| 1621 | 1622 | |
| 1622 | 1623 | clean-dirs := $(KBUILD_EXTMOD) |
| 1623 | −clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers | |
| 1624 | +clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps | |
| 1624 | 1625 | |
| 1625 | 1626 | PHONY += / |
| 1626 | 1627 | /: |
| @@ -66,7 +66,7 @@ __modpost: · 65 unmodified lines | ||
| 66 | 66 | else |
| 67 | 67 | |
| 68 | 68 | MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - \ |
| 69 | − $(if $(KBUILD_NSDEPS),-d modules.nsdeps) | |
| 69 | + $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) | |
| 70 | 70 | |
| 71 | 71 | ifeq ($(KBUILD_EXTMOD),) |
| 72 | 72 | MODPOST += $(wildcard vmlinux) |
| @@ -21,6 +21,12 @@ if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then · 20 unmodified lines | ||
| 21 | 21 | exit 1 |
| 22 | 22 | fi |
| 23 | 23 | |
| 24 | +if [ "$KBUILD_EXTMOD" ]; then | |
| 25 | + src_prefix= | |
| 26 | +else | |
| 27 | + src_prefix=$srctree/ | |
| 28 | +fi | |
| 29 | + | |
| 24 | 30 | generate_deps_for_ns() { |
| 25 | 31 | $SPATCH --very-quiet --in-place --sp-file \ |
| 26 | 32 | $srctree/scripts/coccinelle/misc/add_namespace.cocci -D ns=$1 $2 |
| @@ -32,7 +38,7 @@ generate_deps() { · 5 unmodified lines | ||
| 32 | 38 | local namespaces="$*" |
| 33 | 39 | local mod_source_files="`cat $mod.mod | sed -n 1p \ |
| 34 | 40 | | sed -e 's/\.o/\.c/g' \ |
| 35 | − | sed "s|[^ ]* *|${srctree}/&|g"`" | |
| 41 | + | sed "s|[^ ]* *|${src_prefix}&|g"`" | |
| 36 | 42 | for ns in $namespaces; do |
| 37 | 43 | echo "Adding namespace $ns to module $mod.ko." |
| 38 | 44 | generate_deps_for_ns $ns "$mod_source_files" |
| @@ -54,4 +60,4 @@ generate_deps() { · 15 unmodified lines | ||
| 54 | 60 | while read line |
| 55 | 61 | do |
| 56 | 62 | generate_deps $line |
| 57 | −done < modules.nsdeps | |
| 63 | +done < $MODULES_NSDEPS | |