Commit 961ab4a3 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: merge scripts/Makefile.modsign to scripts/Makefile.modinst 



scripts/Makefile.modsign is a subset of scripts/Makefile.modinst,
and duplicates the code. Let's merge them.

By the way, you do not need to run 'make modules_sign' explicitly
because modules are signed as a part of 'make modules_install' when
CONFIG_MODULE_SIG_ALL=y. If CONFIG_MODULE_SIG_ALL=n, mod_sign_cmd is
set to 'true', so 'make modules_sign' is not functional.

In my understanding, the reason of still keeping this is to handle
corner cases like commit 64178cb6 ("builddeb: fix stripped module
signatures if CONFIG_DEBUG_INFO and CONFIG_MODULE_SIG_ALL are set").

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 65ce9c38

Makefile

+20 −16
Original line number Diff line number Diff line
@@ -1063,15 +1063,6 @@ export INSTALL_DTBS_PATH ?= $(INSTALL_PATH)/dtbs/$(KERNELRELEASE) 
MODLIB	= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)

export MODLIB



ifdef CONFIG_MODULE_SIG_ALL

$(eval $(call config_filename,MODULE_SIG_KEY))



mod_sign_cmd = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODULE_SIG_KEY_SRCPREFIX)$(CONFIG_MODULE_SIG_KEY) certs/signing_key.x509

else

mod_sign_cmd = true

endif

export mod_sign_cmd



HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)



has_libelf = $(call try-run,\
@@ -1439,7 +1430,26 @@ PHONY += modules_prepare 
modules_prepare: prepare

	$(Q)$(MAKE) $(build)=scripts scripts/module.lds



modules_install: __modinst_pre

export modules_sign_only :=



ifeq ($(CONFIG_MODULE_SIG),y)

PHONY += modules_sign

modules_sign: modules_install

	@:



# modules_sign is a subset of modules_install.

# 'make modules_install modules_sign' is equivalent to 'make modules_install'.

ifeq ($(filter modules_install,$(MAKECMDGOALS)),)

modules_sign_only := y

endif

endif



modinst_pre :=

ifneq ($(filter modules_install,$(MAKECMDGOALS)),)

modinst_pre := __modinst_pre

endif



modules_install: $(modinst_pre)

PHONY += __modinst_pre

__modinst_pre:

	@rm -rf $(MODLIB)/kernel
@@ -1454,12 +1464,6 @@ __modinst_pre: 
	@cp -f modules.builtin $(MODLIB)/

	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/



ifeq ($(CONFIG_MODULE_SIG), y)

PHONY += modules_sign

modules_sign:

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modsign

endif



endif # CONFIG_MODULES



###

scripts/Makefile.modinst

+9 −0
Original line number Diff line number Diff line
@@ -74,11 +74,20 @@ quiet_cmd_sign := 
      cmd_sign := :

endif



ifeq ($(modules_sign_only),)



$(dst)/%.ko: $(extmod_prefix)%.ko FORCE

	$(call cmd,install)

	$(call cmd,strip)

	$(call cmd,sign)



else



$(dst)/%.ko: FORCE

	$(call cmd,sign)



endif



#

# Compression

#

scripts/Makefile.modsign

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# ==========================================================================

# Signing modules

# ==========================================================================



PHONY := __modsign

__modsign:



include $(srctree)/scripts/Kbuild.include



modules := $(sort $(shell cat modules.order))



PHONY += $(modules)

__modsign: $(modules)

	@:



quiet_cmd_sign_ko = SIGN [M] $(2)/$(notdir $@)

        cmd_sign_ko = $(mod_sign_cmd) $(2)/$(notdir $@)



# Modules built outside the kernel source tree go into extra by default

INSTALL_MOD_DIR ?= extra

ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D))



modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))



$(modules):

	$(call cmd,sign_ko,$(MODLIB)/$(modinst_dir))



.PHONY: $(PHONY)