The following commit has been merged into the x86/build branch of tip: Commit-ID: 081551266d2fbf6ce69a30c13a355ee476b2e745 Gitweb: https://git.kernel.org/tip/081551266d2fbf6ce69a30c13a355ee476b2e745 Author: Masahiro Yamada <masahiroy@xxxxxxxxxx> AuthorDate: Thu, 29 Jul 2021 23:00:23 +09:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 25 Aug 2021 11:57:38 +02:00 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@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/20210729140023.442101-2-masahiroy@xxxxxxxxxx --- arch/x86/Makefile | 3 ++- arch/x86/boot/Makefile | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1a7c10e..d82d014 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -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: diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index dfbc26a..b5aecb5 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -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)"
|