kbuild: Move depmod call to a separate script

Do not bloat the Makefile with multiline shell statements. No user-visible change intended. Signed-off-by: Michal Marek <mmarek@suse.cz>

kbuild: Move depmod call to a separate script
Do not bloat the Makefile with multiline shell statements. No user-visible change intended. Signed-off-by: Michal Marek <mmarek@suse.cz>
Michal Marek
1 parent 78d3bb4483
Showing 2 changed files with 26 additions and 11 deletions Side-by-side Diff
Makefile
scripts/depmod.sh
@@ -1110,11 +1110,6 @@
  
 PHONY += _modinst_
 _modinst_:
-	@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
-		echo "Warning: you may need to install module-init-tools"; \
-		echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\
-		sleep 1; \
-	fi
 	@rm -rf $(MODLIB)/kernel
 	@rm -f $(MODLIB)/source
 	@mkdir -p $(MODLIB)/kernel
@@ -1531,12 +1526,7 @@
  
 # Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
-      cmd_depmod = \
-	if [ -r System.map -a -x $(DEPMOD) ]; then                              \
-		$(DEPMOD) -ae -F System.map                                     \
-		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) )     \
-		$(KERNELRELEASE);                                               \
-	fi
+      cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)
  
 # Create temporary dir for module support files
 # clean it up only when building all modules
+#!/bin/sh
+#
+# A depmod wrapper used by the toplevel Makefile
+
+if test $# -ne 2; then
+	echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
+	exit 1
+fi
+DEPMOD=$1
+KERNELRELEASE=$2
+
+if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
+	echo "Warning: you may need to install module-init-tools" >&2
+	echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
+	sleep 1
+fi
+
+if ! test -r System.map -a -x "$DEPMOD"; then
+	exit 0
+fi
+set -- -ae -F System.map
+if test -n "$INSTALL_MOD_PATH"; then
+	set -- "$@" -b "$INSTALL_MOD_PATH"
+fi
+exec "$DEPMOD" "$@" "$KERNELRELEASE"
...	...	@@ -1110,11 +1110,6 @@
1110	1110
1111	1111	PHONY += _modinst_
1112	1112	_modinst_:
1113		- @if [ -z "`$(DEPMOD) -V 2>/dev/null \| grep module-init-tools`" ]; then \
1114		- echo "Warning: you may need to install module-init-tools"; \
1115		- echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\
1116		- sleep 1; \
1117		- fi
1118	1113	@rm -rf $(MODLIB)/kernel
1119	1114	@rm -f $(MODLIB)/source
1120	1115	@mkdir -p $(MODLIB)/kernel
...	...	@@ -1531,12 +1526,7 @@
1531	1526
1532	1527	# Run depmod only if we have System.map and depmod is executable
1533	1528	quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
1534		- cmd_depmod = \
1535		- if [ -r System.map -a -x $(DEPMOD) ]; then \
1536		- $(DEPMOD) -ae -F System.map \
1537		- $(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) ) \
1538		- $(KERNELRELEASE); \
1539		- fi
	1529	+ cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)
1540	1530
1541	1531	# Create temporary dir for module support files
1542	1532	# clean it up only when building all modules
	1	+#!/bin/sh
	2	+#
	3	+# A depmod wrapper used by the toplevel Makefile
	4	+
	5	+if test $# -ne 2; then
	6	+ echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
	7	+ exit 1
	8	+fi
	9	+DEPMOD=$1
	10	+KERNELRELEASE=$2
	11	+
	12	+if ! "$DEPMOD" -V 2>/dev/null \| grep -q module-init-tools; then
	13	+ echo "Warning: you may need to install module-init-tools" >&2
	14	+ echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
	15	+ sleep 1
	16	+fi
	17	+
	18	+if ! test -r System.map -a -x "$DEPMOD"; then
	19	+ exit 0
	20	+fi
	21	+set -- -ae -F System.map
	22	+if test -n "$INSTALL_MOD_PATH"; then
	23	+ set -- "$@" -b "$INSTALL_MOD_PATH"
	24	+fi
	25	+exec "$DEPMOD" "$@" "$KERNELRELEASE"