Skip to contentSkip to conversation

powerpc: remove unused zInstall target from arch/powerpc/boot/Makefile

PATCH Applied Masahiro Yamada 3 participants 8 messages Jul 29, 2021 – Aug 18, 2021 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 powerpc: remove unused zInstall target from arch/powerpc/boot/Makefile

Commit c913e5f95e54 ("powerpc/boot: Don't install zImage.* from make install") added the zInstall target to arch/powerpc/boot/Makefile, but you cannot use it since the corresponding hook is missing in arch/powerpc/Makefile.

It has never worked since its addition. Nobody has complained about it for 7 years, which means this code was unneeded.

With this removal, the install.sh will be passed in with 4 parameters. Simplify the shell script.

---

 arch/powerpc/boot/Makefile   |  6 +-----
 arch/powerpc/boot/install.sh | 13 -------------
 2 files changed, 1 insertion(+), 18 deletions(-)
arch/powerpc/boot/Makefile +1 -5
index e312ea802aa6..a702f9d1ec0d 100644
@@ -448,11 +448,7 @@ $(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))
 install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
 	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
 
-# Install the vmlinux and other built boot targets.
-zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
-	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^
-
-PHONY += install zInstall
+PHONY += install
 
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
arch/powerpc/boot/install.sh +0 -13
index b6a256bc96ee..658c93ca7437 100644
@@ -15,7 +15,6 @@
 #   $2 - kernel image file
 #   $3 - kernel map file
 #   $4 - default install path (blank if root directory)
-#   $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc.
 #
 
 # Bail with error code if anything goes wrong
@@ -41,15 +40,3 @@ fi
 
 cat $2 > $4/$image_name
 cp $3 $4/System.map
-
-# Copy all the bootable image files
-path=$4
-shift 4
-while [ $# -ne 0 ]; do
-	image_name=`basename $1`
-	if [ -f $path/$image_name ]; then
-		mv $path/$image_name $path/$image_name.old
-	fi
-	cat $1 > $path/$image_name
-	shift
-done;
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/3 powerpc: make the install target not depend on any build artifact

The install target should not depend on any build artifact.

The reason is explained in commit 19514fc665ff ("arm, kbuild: make "make install" not depend on vmlinux").

Change the PowerPC installation code in a similar way.

---

 arch/powerpc/boot/Makefile   |  2 +-
 arch/powerpc/boot/install.sh | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
arch/powerpc/boot/Makefile +1 -1
index a702f9d1ec0d..0d165bd98b61 100644
@@ -445,7 +445,7 @@ $(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))
 	$(Q)rm -f $@; ln $< $@
 
 # Only install the vmlinux
-install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
+install:
 	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
 
 PHONY += install
arch/powerpc/boot/install.sh +14 -0
index 658c93ca7437..14473150ddb4 100644
@@ -20,6 +20,20 @@
 # Bail with error code if anything goes wrong
 set -e
 
+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
Signature · 1 line
2.27.0
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] powerpc: make the install target not depend on any build artifact

Quoted 9 lines · Masahiro Yamada

The install target should not depend on any build artifact.

The reason is explained in commit 19514fc665ff ("arm, kbuild: make "make install" not depend on vmlinux").

Change the PowerPC installation code in a similar way.

Quoted 47 lines

---

 arch/powerpc/boot/Makefile   |  2 +-
 arch/powerpc/boot/install.sh | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
arch/powerpc/boot/Makefile +1 -1
index a702f9d1ec0d..0d165bd98b61 100644
@@ -445,7 +445,7 @@ $(obj)/zImage.initrd:       $(addprefix $(obj)/, $(initrd-y))
        $(Q)rm -f $@; ln $< $@
 
 # Only install the vmlinux
-install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
+install:
        sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
 
 PHONY += install
arch/powerpc/boot/install.sh +14 -1
index 658c93ca7437..14473150ddb4 100644
@@ -20,6 +20,20 @@
 # Bail with error code if anything goes wrong
 set -e
 
+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
--

2.27.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
#3 lore raw

PATCH 3/3 powerpc: move the install rule to arch/powerpc/Makefile

In reply to Masahiro Yamada

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

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

---

 arch/powerpc/Makefile      | 3 ++-
 arch/powerpc/boot/Makefile | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)
arch/powerpc/Makefile +2 -1
index 6505d66f1193..9aaf1abbc641 100644
@@ -407,7 +407,8 @@ endef
 
 PHONY += install
 install:
-	$(Q)$(MAKE) $(build)=$(boot) install
+	sh -x $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" vmlinux \
+	System.map "$(INSTALL_PATH)"
 
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
arch/powerpc/boot/Makefile +0 -6
index 0d165bd98b61..10c0fb306f15 100644
@@ -444,12 +444,6 @@ $(obj)/zImage:		$(addprefix $(obj)/, $(image-y))
 $(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))
 	$(Q)rm -f $@; ln $< $@
 
-# Only install the vmlinux
-install:
-	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
-
-PHONY += install
-
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
 	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
Signature · 1 line
2.27.0
#4 lore raw

Re: [PATCH 3/3] powerpc: move the install rule to arch/powerpc/Makefile

Quoted 4 lines · Masahiro Yamada

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

Sure, but there are more arch/ subdirs that DO invoke install.sh from arch/<arch>/boot/Makefile than, not:

arch/<arch>/boot/Makefile:
- parisc
- nios2
- arm
- nds32
- sparc
- riscv
- 390
- ppc (this patch)
- x86
- arm64

arch/<arch>/Makefile:
- ia64
- m68k

Patch is fine, but right now the tree is a bit inconsistent.

Quoted 44 lines

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

---

 arch/powerpc/Makefile      | 3 ++-
 arch/powerpc/boot/Makefile | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)
arch/powerpc/Makefile +2 -1
index 6505d66f1193..9aaf1abbc641 100644
@@ -407,7 +407,8 @@ endef
 
 PHONY += install
 install:
-       $(Q)$(MAKE) $(build)=$(boot) install
+       sh -x $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" vmlinux \
+       System.map "$(INSTALL_PATH)"
 
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
arch/powerpc/boot/Makefile +0 -7
index 0d165bd98b61..10c0fb306f15 100644
@@ -444,12 +444,6 @@ $(obj)/zImage:             $(addprefix $(obj)/, $(image-y))
 $(obj)/zImage.initrd:  $(addprefix $(obj)/, $(initrd-y))
        $(Q)rm -f $@; ln $< $@
 
-# Only install the vmlinux
-install:
-       sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
-
-PHONY += install
-
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
        zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
--

2.27.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
#5 lore raw

Re: [PATCH 3/3] powerpc: move the install rule to arch/powerpc/Makefile

Quoted 10 lines · Nick Desaulniers
Quoted 4 lines · Masahiro Yamada

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

Sure, but there are more arch/ subdirs that DO invoke install.sh from arch/<arch>/boot/Makefile than, not:

Quoted 11 lines

arch/<arch>/boot/Makefile:
- parisc
- nios2
- arm
- nds32
- sparc
- riscv
- 390
- ppc (this patch)
- x86
- arm64

I sent patches for these architectures.

Check LKML.

Quoted 55 lines

arch/<arch>/Makefile:
- ia64
- m68k

Patch is fine, but right now the tree is a bit inconsistent.

Quoted 42 lines

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

---

 arch/powerpc/Makefile      | 3 ++-
 arch/powerpc/boot/Makefile | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)
arch/powerpc/Makefile +2 -1
index 6505d66f1193..9aaf1abbc641 100644
@@ -407,7 +407,8 @@ endef
 
 PHONY += install
 install:
-       $(Q)$(MAKE) $(build)=$(boot) install
+       sh -x $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" vmlinux \
+       System.map "$(INSTALL_PATH)"
 
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
arch/powerpc/boot/Makefile +0 -7
index 0d165bd98b61..10c0fb306f15 100644
@@ -444,12 +444,6 @@ $(obj)/zImage:             $(addprefix $(obj)/, $(image-y))
 $(obj)/zImage.initrd:  $(addprefix $(obj)/, $(initrd-y))
        $(Q)rm -f $@; ln $< $@
 
-# Only install the vmlinux
-install:
-       sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
-
-PHONY += install
-
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
        zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
--
Quoted 2 lines

2.27.0

--
Thanks,
~Nick Desaulniers

Signature · 2 lines
Best Regards
Masahiro Yamada
Reviewed-by on v1 1/3
#6 lore raw
In reply to Masahiro Yamada
Quoted 6 lines · Masahiro Yamada

Commit c913e5f95e54 ("powerpc/boot: Don't install zImage.* from make install") added the zInstall target to arch/powerpc/boot/Makefile, but you cannot use it since the corresponding hook is missing in arch/powerpc/Makefile.

Quoted 7 lines

It has never worked since its addition. Nobody has complained about it for 7 years, which means this code was unneeded.

With this removal, the install.sh will be passed in with 4 parameters. Simplify the shell script.

Quoted 54 lines

---

 arch/powerpc/boot/Makefile   |  6 +-----
 arch/powerpc/boot/install.sh | 13 -------------
 2 files changed, 1 insertion(+), 18 deletions(-)
arch/powerpc/boot/Makefile +1 -5
index e312ea802aa6..a702f9d1ec0d 100644
@@ -448,11 +448,7 @@ $(obj)/zImage.initrd:      $(addprefix $(obj)/, $(initrd-y))
 install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
        sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)"
 
-# Install the vmlinux and other built boot targets.
-zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
-       sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^
-
-PHONY += install zInstall
+PHONY += install
 
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
arch/powerpc/boot/install.sh +0 -14
index b6a256bc96ee..658c93ca7437 100644
@@ -15,7 +15,6 @@
 #   $2 - kernel image file
 #   $3 - kernel map file
 #   $4 - default install path (blank if root directory)
-#   $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc.
 #
 
 # Bail with error code if anything goes wrong
@@ -41,15 +40,3 @@ fi
 
 cat $2 > $4/$image_name
 cp $3 $4/System.map
-
-# Copy all the bootable image files
-path=$4
-shift 4
-while [ $# -ne 0 ]; do
-       image_name=`basename $1`
-       if [ -f $path/$image_name ]; then
-               mv $path/$image_name $path/$image_name.old
-       fi
-       cat $1 > $path/$image_name
-       shift
-done;
--

2.27.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
#7 lore raw
In reply to Masahiro Yamada
Quoted 9 lines · Masahiro Yamada

Commit c913e5f95e54 ("powerpc/boot: Don't install zImage.* from make install") added the zInstall target to arch/powerpc/boot/Makefile, but you cannot use it since the corresponding hook is missing in arch/powerpc/Makefile.

It has never worked since its addition. Nobody has complained about it for 7 years, which means this code was unneeded.

[...]

Applied to powerpc/next.

[1/3] powerpc: remove unused zInstall target from arch/powerpc/boot/Makefile

      https://git.kernel.org/powerpc/c/156ca4e650bfb9a4259b427069caa11b5a4df3d4
[2/3] powerpc: make the install target not depend on any build artifact
      https://git.kernel.org/powerpc/c/9bef456b20581e630ef9a13555ca04fed65a859d
[3/3] powerpc: move the install rule to arch/powerpc/Makefile
      https://git.kernel.org/powerpc/c/86ff0bce2e9665c8b074930fe6caed615da070c1

cheers