On 4/7/21 1:23 PM, Masahiro Yamada wrote:
On Wed, Apr 7, 2021 at 2:34 PM Greg Kroah-Hartman
<[email protected]> wrote:
The common scripts/install.sh script will now work for parisc, all that
is needed is to add the compressed image type to it. So add that file
type check, and then we can remove the two different copies of the
parisc install.sh script that were only different by one line and have
the arch call the common install script.
Cc: "James E.J. Bottomley" <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/parisc/Makefile | 4 +--
arch/parisc/boot/Makefile | 2 +-
arch/parisc/boot/install.sh | 65 ------------------------------------
arch/parisc/install.sh | 66 -------------------------------------
scripts/install.sh | 1 +
5 files changed, 4 insertions(+), 134 deletions(-)
delete mode 100644 arch/parisc/boot/install.sh
delete mode 100644 arch/parisc/install.sh
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 7d9f71aa829a..296d8ab8e2aa 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -164,10 +164,10 @@ vmlinuz: vmlinux
endif
install:
- $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \
+ $(CONFIG_SHELL) $(srctree)/scripts/install.sh \
$(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)"
zinstall:
- $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \
+ $(CONFIG_SHELL) $(srctree)/scripts/install.sh \
$(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)"
CLEAN_FILES += lifimage
diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile
index 61f44142cfe1..ad2611929aee 100644
--- a/arch/parisc/boot/Makefile
+++ b/arch/parisc/boot/Makefile
@@ -17,5 +17,5 @@ $(obj)/compressed/vmlinux: FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
install: $(CONFIGURE) $(obj)/bzImage
- sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
+ sh -x $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \
System.map "$(INSTALL_PATH)"
As far as I understood, there is no way to invoke this 'install' target
in arch/parisc/boot/Makefile since everything is done
by arch/parisc/Makefile.
Can we remove this 'install' rule entirely?
Yes, I think it can go in arch/parisc/boot/Makefile.
Helge
