Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Masahiro Yamada and committed by
Borislav Petkov
08155126 6d61b8e6

+3 -7
+2 -1
arch/x86/Makefile
··· 259 259 260 260 PHONY += install 261 261 install: 262 - $(Q)$(MAKE) $(build)=$(boot) $@ 262 + $(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \ 263 + $(KBUILD_IMAGE) System.map "$(INSTALL_PATH)" 263 264 264 265 PHONY += vdso_install 265 266 vdso_install:
+1 -6
arch/x86/boot/Makefile
··· 133 133 cmd_genimage = $(BASH) $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImage \ 134 134 $(obj)/mtools.conf '$(FDARGS)' $(FDINITRD) 135 135 136 - PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage install 136 + PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage 137 137 138 138 # This requires write access to /dev/fd0 139 139 # All images require syslinux to be installed; hdimage also requires ··· 156 156 isoimage: $(imgdeps) 157 157 $(call cmd,genimage,isoimage,$(obj)/image.iso) 158 158 @$(kecho) 'Kernel: $(obj)/image.iso is ready' 159 - 160 - install: 161 - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh \ 162 - $(KERNELRELEASE) $(obj)/bzImage \ 163 - System.map "$(INSTALL_PATH)"