summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-02-16 17:48:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-11 16:14:53 +0300
commitb696f79fd1888dbec2d6df6cb47e95354af442de (patch)
tree447942eea0c8db1a8d0ab7e5616f90d95f0cb7ac
parent55185baad97abbf50131d426419a6097bb5ad32a (diff)
downloadlinux-b696f79fd1888dbec2d6df6cb47e95354af442de.tar.xz
s390: make 'install' not depend on vmlinux
[ Upstream commit 94e90f727f7424d827256023cace829cad6896f4 ] 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. The variable, CONFIGURE, is not set by anyone. Remove it as well. Link: https://lkml.kernel.org/r/20200216144829.27023-1-masahiroy@kernel.org Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/s390/Makefile2
-rw-r--r--arch/s390/boot/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 4bccde36cb16..9a3a698c8fca 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -140,7 +140,7 @@ all: bzImage
#KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg...
KBUILD_IMAGE := $(boot)/bzImage
-install: vmlinux
+install:
$(Q)$(MAKE) $(build)=$(boot) $@
bzImage: vmlinux
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index f6a9b0c20355..45c72d1f9e7d 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -46,7 +46,7 @@ quiet_cmd_ar = AR $@
$(obj)/startup.a: $(OBJECTS) FORCE
$(call if_changed,ar)
-install: $(CONFIGURE) $(obj)/bzImage
+install:
sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
System.map "$(INSTALL_PATH)"