2021-07-29 14:28:19

by Masahiro Yamada

Subject: [PATCH] s390: move the install rule to arch/s390/Makefile

Currently, the install target in arch/s390/Makefile descends into
arch/s390/boot/Makefile to invoke the shell script, but there is no
good reason to do so.

arch/s390/Makefile can run the shell script directly.

Signed-off-by: Masahiro Yamada <[email protected]>
---

arch/s390/Makefile | 3 ++-
arch/s390/boot/Makefile | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 1e3172877982..17dc4f1ac4fa 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -142,7 +142,8 @@ all: bzImage
KBUILD_IMAGE := $(boot)/bzImage

install:
- $(Q)$(MAKE) $(build)=$(boot) $@
+ sh -x $(srctree)/$(boot)/install.sh $(KERNELRELEASE) $(KBUILD_IMAGE) \
+ System.map "$(INSTALL_PATH)"

bzImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 41a64b8dce25..6e4b56470b85 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -69,7 +69,3 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE

$(obj)/startup.a: $(OBJECTS) FORCE
$(call if_changed,ar)
-
-install:
- sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
- System.map "$(INSTALL_PATH)"
--
2.27.0

2021-07-29 18:51:16

by Heiko Carstens

Subject: Re: [PATCH] s390: move the install rule to arch/s390/Makefile

On Thu, Jul 29, 2021 at 11:23:38PM +0900, Masahiro Yamada wrote:
> Currently, the install target in arch/s390/Makefile descends into
> arch/s390/boot/Makefile to invoke the shell script, but there is no
> good reason to do so.
>
> arch/s390/Makefile can run the shell script directly.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> arch/s390/Makefile | 3 ++-
> arch/s390/boot/Makefile | 4 ----
> 2 files changed, 2 insertions(+), 5 deletions(-)

Applied, thanks!