ANDROID: Drop second argument from depmod.sh.

HONG Yifan · HONG Yifan · commit 48e2d894489c · 2025-03-19T20:53:34.000-07:00
This partially reverts commit ee1b16e ("ANDROID: Kbuild: Add support for KBUILD_MIXED_TREE"). Now that with commit 214c0ee ("kbuild: add $(objtree)/ prefix to some in-kernel build artifacts"), System.map is found in $objtree already, so there is no need to set mixed-build-prefix any more. Bug: 402231876 Change-Id: Ic48bd2f48ea41dd086e72a9071921ef2a116b8a4 Signed-off-by: HONG Yifan <elsk@google.com>
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
@@ -143,7 +143,7 @@ depmod: $(install-y)
 	$(call cmd,depmod)
 
 quiet_cmd_depmod = DEPMOD  $(MODLIB)
-      cmd_depmod = $(srctree)/scripts/depmod.sh $(KERNELRELEASE) $(mixed-build-prefix)
+      cmd_depmod = $(srctree)/scripts/depmod.sh $(KERNELRELEASE)
 endif
 
 else
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
@@ -3,8 +3,8 @@
 #
 # A depmod wrapper
 
-if test $# -ne 1 -a $# -ne 2; then
-	echo "Usage: $0 <kernelrelease> [System.map folder]" >&2
+if test $# -ne 1; then
+	echo "Usage: $0 <kernelrelease>" >&2
 	exit 1
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`	`# A depmod wrapper`
`5`	`5`
`6`		`-if test $# -ne 1 -a $# -ne 2; then`
`7`		`- echo "Usage: $0 <kernelrelease> [System.map folder]" >&2`
	`6`	`+if test $# -ne 1; then`
	`7`	`+ echo "Usage: $0 <kernelrelease>" >&2`
`8`	`8`	`exit 1`
`9`	`9`	`fi`
`10`	`10`