diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-02-19 15:05:50 +0900 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 11:00:25 +0200 |
| commit | da5ff5d39a793ee262cea38ae1045826e0284c00 (patch) | |
| tree | 3e2933b52dae872c1d08067243475001f5254622 | |
| parent | 5140aae14fc1c161736bbc9bd862de528ef37a94 (diff) | |
arm64: kbuild: make "make install" not depend on vmlinux
For the same reason as commit 19514fc665ff ("arm, kbuild: make "make
install" not depend on vmlinux"), the install targets should never
trigger the rebuild of the kernel.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rwxr-xr-x | arch/arm64/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/Makefile | 4 | ||||
| -rwxr-xr-x | arch/arm64/boot/install.sh | 14 |
3 files changed, 17 insertions, 3 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index ad6c9db48..d0c419f79 100755 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -67,7 +67,7 @@ boot := arch/arm64/boot Image Image.gz: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ -zinstall install: vmlinux +zinstall install: $(Q)$(MAKE) $(build)=$(boot) $@ %.dtb: scripts diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index df519849f..489ae2062 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -35,10 +35,10 @@ $(obj)/Image.gz: $(obj)/Image FORCE $(obj)/Image.gz-dtb: $(obj)/Image.gz $(DTB_OBJS) FORCE $(call if_changed,cat) -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)" diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh index 12ed78aa6..d91e1f022 100755 --- a/arch/arm64/boot/install.sh +++ b/arch/arm64/boot/install.sh @@ -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 |