Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8684fa3e authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Will Deacon
Browse files

arm64: kbuild: make "make install" not depend on vmlinux 



For the same reason as commit 19514fc6 ("arm, kbuild: make "make
install" not depend on vmlinux"), the install targets should never
trigger the rebuild of the kernel.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 722ec35f

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ Image: vmlinux 
Image.%: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



zinstall install: vmlinux

zinstall install:

	$(Q)$(MAKE) $(build)=$(boot) $@



%.dtb: scripts

arch/arm64/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ $(obj)/Image.lzma: $(obj)/Image FORCE 
$(obj)/Image.lzo: $(obj)/Image FORCE

	$(call if_changed,lzo)



install: $(obj)/Image

install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"



zinstall: $(obj)/Image.gz

zinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image.gz System.map "$(INSTALL_PATH)"

arch/arm64/boot/install.sh

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,20 @@ 
#   $4 - default install path (blank if root directory)

#



verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2

		echo " *** Missing file: $1"                              1>&2

		echo ' *** You need to run "make" before "make install".' 1>&2

		echo ""                                                   1>&2

		exit 1

	fi

}



# Make sure the files actually exist

verify "$2"

verify "$3"



# User may have a custom install script

if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi