kbuild: move module strip/compression code into scripts/Makefile.modinst
Both mod_strip_cmd and mod_compress_cmd are only used in scripts/Makefile.modinst, hence there is no good reason to define them in the top Makefile. Move the relevant code to scripts/Makefile.modinst. Also, show separate log messages for each of install, strip, sign, and compress. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada
parent
ccae4cfa7b
commit
65ce9c3832
2 changed files with 69 additions and 41 deletions
32
Makefile
32
Makefile
|
|
@ -1063,38 +1063,6 @@ export INSTALL_DTBS_PATH ?= $(INSTALL_PATH)/dtbs/$(KERNELRELEASE)
|
||||||
MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
|
MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
|
||||||
export MODLIB
|
export MODLIB
|
||||||
|
|
||||||
#
|
|
||||||
# INSTALL_MOD_STRIP, if defined, will cause modules to be
|
|
||||||
# stripped after they are installed. If INSTALL_MOD_STRIP is '1', then
|
|
||||||
# the default option --strip-debug will be used. Otherwise,
|
|
||||||
# INSTALL_MOD_STRIP value will be used as the options to the strip command.
|
|
||||||
|
|
||||||
ifdef INSTALL_MOD_STRIP
|
|
||||||
ifeq ($(INSTALL_MOD_STRIP),1)
|
|
||||||
mod_strip_cmd = $(STRIP) --strip-debug
|
|
||||||
else
|
|
||||||
mod_strip_cmd = $(STRIP) $(INSTALL_MOD_STRIP)
|
|
||||||
endif # INSTALL_MOD_STRIP=1
|
|
||||||
else
|
|
||||||
mod_strip_cmd = true
|
|
||||||
endif # INSTALL_MOD_STRIP
|
|
||||||
export mod_strip_cmd
|
|
||||||
|
|
||||||
# CONFIG_MODULE_COMPRESS, if defined, will cause module to be compressed
|
|
||||||
# after they are installed in agreement with CONFIG_MODULE_COMPRESS_GZIP
|
|
||||||
# or CONFIG_MODULE_COMPRESS_XZ.
|
|
||||||
|
|
||||||
mod_compress_cmd = true
|
|
||||||
ifdef CONFIG_MODULE_COMPRESS
|
|
||||||
ifdef CONFIG_MODULE_COMPRESS_GZIP
|
|
||||||
mod_compress_cmd = $(KGZIP) -n -f
|
|
||||||
endif # CONFIG_MODULE_COMPRESS_GZIP
|
|
||||||
ifdef CONFIG_MODULE_COMPRESS_XZ
|
|
||||||
mod_compress_cmd = $(XZ) --lzma2=dict=2MiB -f
|
|
||||||
endif # CONFIG_MODULE_COMPRESS_XZ
|
|
||||||
endif # CONFIG_MODULE_COMPRESS
|
|
||||||
export mod_compress_cmd
|
|
||||||
|
|
||||||
ifdef CONFIG_MODULE_SIG_ALL
|
ifdef CONFIG_MODULE_SIG_ALL
|
||||||
$(eval $(call config_filename,MODULE_SIG_KEY))
|
$(eval $(call config_filename,MODULE_SIG_KEY))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
PHONY := __modinst
|
PHONY := __modinst
|
||||||
__modinst:
|
__modinst:
|
||||||
|
|
||||||
|
include include/config/auto.conf
|
||||||
include $(srctree)/scripts/Kbuild.include
|
include $(srctree)/scripts/Kbuild.include
|
||||||
|
|
||||||
modules := $(sort $(shell cat $(MODORDER)))
|
modules := $(sort $(shell cat $(MODORDER)))
|
||||||
|
|
@ -17,21 +18,80 @@ INSTALL_MOD_DIR ?= extra
|
||||||
dst := $(MODLIB)/$(INSTALL_MOD_DIR)
|
dst := $(MODLIB)/$(INSTALL_MOD_DIR)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
modules := $(patsubst $(extmod_prefix)%, $(dst)/%, $(modules))
|
suffix-y :=
|
||||||
|
suffix-$(CONFIG_MODULE_COMPRESS_GZIP) := .gz
|
||||||
|
suffix-$(CONFIG_MODULE_COMPRESS_XZ) := .xz
|
||||||
|
|
||||||
|
modules := $(patsubst $(extmod_prefix)%, $(dst)/%$(suffix-y), $(modules))
|
||||||
|
|
||||||
__modinst: $(modules)
|
__modinst: $(modules)
|
||||||
@:
|
@:
|
||||||
|
|
||||||
# Don't stop modules_install if we can't sign external modules.
|
quiet_cmd_none =
|
||||||
quiet_cmd_install = INSTALL $@
|
cmd_none = :
|
||||||
cmd_install = \
|
|
||||||
mkdir -p $(dir $@); cp $< $@; \
|
|
||||||
$(mod_strip_cmd) $@; \
|
|
||||||
$(mod_sign_cmd) $@ $(patsubst %,|| true,$(KBUILD_EXTMOD)) ; \
|
|
||||||
$(mod_compress_cmd) $@
|
|
||||||
|
|
||||||
$(modules): $(dst)/%: $(extmod_prefix)% FORCE
|
#
|
||||||
|
# Installation
|
||||||
|
#
|
||||||
|
quiet_cmd_install = INSTALL $@
|
||||||
|
cmd_install = mkdir -p $(dir $@); cp $< $@
|
||||||
|
|
||||||
|
# Strip
|
||||||
|
#
|
||||||
|
# INSTALL_MOD_STRIP, if defined, will cause modules to be stripped after they
|
||||||
|
# are installed. If INSTALL_MOD_STRIP is '1', then the default option
|
||||||
|
# --strip-debug will be used. Otherwise, INSTALL_MOD_STRIP value will be used
|
||||||
|
# as the options to the strip command.
|
||||||
|
ifdef INSTALL_MOD_STRIP
|
||||||
|
|
||||||
|
ifeq ($(INSTALL_MOD_STRIP),1)
|
||||||
|
strip-option := --strip-debug
|
||||||
|
else
|
||||||
|
strip-option := $(INSTALL_MOD_STRIP)
|
||||||
|
endif
|
||||||
|
|
||||||
|
quiet_cmd_strip = STRIP $@
|
||||||
|
cmd_strip = $(STRIP) $(strip-option) $@
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
quiet_cmd_strip =
|
||||||
|
cmd_strip = :
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# Signing
|
||||||
|
# Don't stop modules_install even if we can't sign external modules.
|
||||||
|
#
|
||||||
|
ifeq ($(CONFIG_MODULE_SIG_ALL),y)
|
||||||
|
quiet_cmd_sign = SIGN $@
|
||||||
|
$(eval $(call config_filename,MODULE_SIG_KEY))
|
||||||
|
cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODULE_SIG_KEY_SRCPREFIX)$(CONFIG_MODULE_SIG_KEY) certs/signing_key.x509 $@ \
|
||||||
|
$(if $(KBUILD_EXTMOD),|| true)
|
||||||
|
else
|
||||||
|
quiet_cmd_sign :=
|
||||||
|
cmd_sign := :
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(dst)/%.ko: $(extmod_prefix)%.ko FORCE
|
||||||
$(call cmd,install)
|
$(call cmd,install)
|
||||||
|
$(call cmd,strip)
|
||||||
|
$(call cmd,sign)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Compression
|
||||||
|
#
|
||||||
|
quiet_cmd_gzip = GZIP $@
|
||||||
|
cmd_gzip = $(KGZIP) -n -f $<
|
||||||
|
quiet_cmd_xz = XZ $@
|
||||||
|
cmd_xz = $(XZ) --lzma2=dict=2MiB -f $<
|
||||||
|
|
||||||
|
$(dst)/%.ko.gz: $(dst)/%.ko FORCE
|
||||||
|
$(call cmd,gzip)
|
||||||
|
|
||||||
|
$(dst)/%.ko.xz: $(dst)/%.ko FORCE
|
||||||
|
$(call cmd,xz)
|
||||||
|
|
||||||
PHONY += FORCE
|
PHONY += FORCE
|
||||||
FORCE:
|
FORCE:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue