| From 3246982a532975672c6263142eb3657d463443b6 Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <masahiroy@kernel.org> |
| Date: Sun, 16 Feb 2020 23:48:29 +0900 |
| Subject: [PATCH] s390: make 'install' not depend on vmlinux |
| |
| commit 94e90f727f7424d827256023cace829cad6896f4 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/Makefile b/arch/s390/Makefile |
| index b525c795587e..1d53ea0a4e14 100644 |
| --- a/arch/s390/Makefile |
| +++ b/arch/s390/Makefile |
| @@ -146,7 +146,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 7cba96e7587b..98e808b4e6ec 100644 |
| --- a/arch/s390/boot/Makefile |
| +++ b/arch/s390/boot/Makefile |
| @@ -70,7 +70,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE |
| $(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)" |
| |
| -- |
| 2.7.4 |
| |
