Commit fc4da9a3 authored by Michal Marek's avatar Michal Marek
Browse files

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: default avatarMichal Marek <mmarek@suse.cz>
parent 78d3bb44

Makefile

+1 −11
Original line number Diff line number Diff line
@@ -1110,11 +1110,6 @@ modules_install: _modinst_ _modinst_post 


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 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 


# 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

scripts/depmod.sh

0 → 100755
+25 −0
Original line number Diff line number Diff line 
#!/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"