Commit 08155126 authored Jul 29, 2021 by Masahiro Yamada Committed by Borislav Petkov Aug 25, 2021

x86/build: Move the install rule to arch/x86/Makefile



Currently, the install target in arch/x86/Makefile descends into
arch/x86/boot/Makefile to invoke the shell script, but there is no
good reason to do so.

arch/x86/Makefile can run the shell script directly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210729140023.442101-2-masahiroy@kernel.org

parent 6d61b8e6

arch/x86/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,8 @@ $(BOOT_TARGETS): vmlinux

		PHONY += install
		install:
		$(Q)$(MAKE) $(build)=$(boot) $@
		$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
		$(KBUILD_IMAGE) System.map "$(INSTALL_PATH)"

		PHONY += vdso_install
		vdso_install:

arch/x86/boot/Makefile

+1 −6

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ quiet_cmd_genimage = GENIMAGE $3
		cmd_genimage = $(BASH) $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImage \
		$(obj)/mtools.conf '$(FDARGS)' $(FDINITRD)

		PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage install
		PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage

		# This requires write access to /dev/fd0
		# All images require syslinux to be installed; hdimage also requires
		@@ -156,8 +156,3 @@ hdimage: $(imgdeps)
		isoimage: $(imgdeps)
		$(call cmd,genimage,isoimage,$(obj)/image.iso)
		@$(kecho) 'Kernel: $(obj)/image.iso is ready'

		install:
		$(CONFIG_SHELL) $(srctree)/$(src)/install.sh \
		$(KERNELRELEASE) $(obj)/bzImage \
		System.map "$(INSTALL_PATH)"