Skip to contentSkip to conversation

s390: move the install rule to arch/s390/Makefile

PATCH Applied Masahiro Yamada 2 participants 2 messages Jul 29, 2021 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 arch/s390/Makefile      | 3 ++-
 arch/s390/boot/Makefile | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)
arch/s390/Makefile +2 -1
index 1e3172877982..17dc4f1ac4fa 100644
@@ -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)/$@
arch/s390/boot/Makefile +0 -4
index 41a64b8dce25..6e4b56470b85 100644
@@ -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)"
Signature · 1 line
2.27.0
maintainer Applied
#1 lore raw
Quoted 4 lines · Masahiro Yamada

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.

Quoted 8 lines

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

---

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

Applied, thanks!