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

scripts/Makefile.modpost +1 −1
scripts/nsdeps +8 −2

scripts/Makefile.modpost+1−1

@@ -66,7 +66,7 @@ __modpost: · 65 unmodified lines
66	else	66	else
67		67
68	MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - \	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	ifeq ($(KBUILD_EXTMOD),)	71	ifeq ($(KBUILD_EXTMOD),)
72	MODPOST += $(wildcard vmlinux)	72	MODPOST += $(wildcard vmlinux)

scripts/nsdeps+8−2

 	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
 	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"
 while read line
 do
 	generate_deps $line
-done < modules.nsdeps
+done < $MODULES_NSDEPS