| Message ID | 20210824154820.293290-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2] parisc: remove unused arch/parisc/boot/install.sh and its phony target | expand |
On 8/24/21 5:48 PM, Masahiro Yamada wrote: > Parisc has two similar installation scripts: > > arch/parisc/install.sh > arch/parisc/boot/install.sh > > The latter is never used because 'make ARCH=parisc install' always > invokes the 'install' target in arch/parisc/Makefile. > > The target in arch/parisc/boot/Makefile is not used either. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Thanks, applied! Helge > --- > > Changes in v2: > - Remove arch/parisc/boot/install.sh > > arch/parisc/boot/Makefile | 4 --- > arch/parisc/boot/install.sh | 65 ------------------------------------- > 2 files changed, 69 deletions(-) > delete mode 100644 arch/parisc/boot/install.sh > > diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile > index 61f44142cfe1..b873ee4720ca 100644 > --- a/arch/parisc/boot/Makefile > +++ b/arch/parisc/boot/Makefile > @@ -15,7 +15,3 @@ $(obj)/bzImage: $(obj)/compressed/vmlinux FORCE > > $(obj)/compressed/vmlinux: FORCE > $(Q)$(MAKE) $(build)=$(obj)/compressed $@ > - > -install: $(CONFIGURE) $(obj)/bzImage > - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ > - System.map "$(INSTALL_PATH)" > diff --git a/arch/parisc/boot/install.sh b/arch/parisc/boot/install.sh > deleted file mode 100644 > index 8f7c365fad83..000000000000 > --- a/arch/parisc/boot/install.sh > +++ /dev/null > @@ -1,65 +0,0 @@ > -#!/bin/sh > -# > -# arch/parisc/install.sh, derived from arch/i386/boot/install.sh > -# > -# This file is subject to the terms and conditions of the GNU General Public > -# License. See the file "COPYING" in the main directory of this archive > -# for more details. > -# > -# Copyright (C) 1995 by Linus Torvalds > -# > -# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin > -# > -# "make install" script for i386 architecture > -# > -# Arguments: > -# $1 - kernel version > -# $2 - kernel image file > -# $3 - kernel map file > -# $4 - default install path (blank if root directory) > -# > - > -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 [ -n "${INSTALLKERNEL}" ]; then > - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi > - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi > -fi > - > -# Default install > - > -if [ "$(basename $2)" = "zImage" ]; then > -# Compressed install > - echo "Installing compressed kernel" > - base=vmlinuz > -else > -# Normal install > - echo "Installing normal kernel" > - base=vmlinux > -fi > - > -if [ -f $4/$base-$1 ]; then > - mv $4/$base-$1 $4/$base-$1.old > -fi > -cat $2 > $4/$base-$1 > - > -# Install system map file > -if [ -f $4/System.map-$1 ]; then > - mv $4/System.map-$1 $4/System.map-$1.old > -fi > -cp $3 $4/System.map-$1 >
diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile index 61f44142cfe1..b873ee4720ca 100644 --- a/arch/parisc/boot/Makefile +++ b/arch/parisc/boot/Makefile @@ -15,7 +15,3 @@ $(obj)/bzImage: $(obj)/compressed/vmlinux FORCE $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ - -install: $(CONFIGURE) $(obj)/bzImage - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ - System.map "$(INSTALL_PATH)" diff --git a/arch/parisc/boot/install.sh b/arch/parisc/boot/install.sh deleted file mode 100644 index 8f7c365fad83..000000000000 --- a/arch/parisc/boot/install.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -# arch/parisc/install.sh, derived from arch/i386/boot/install.sh -# -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. -# -# Copyright (C) 1995 by Linus Torvalds -# -# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin -# -# "make install" script for i386 architecture -# -# Arguments: -# $1 - kernel version -# $2 - kernel image file -# $3 - kernel map file -# $4 - default install path (blank if root directory) -# - -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 [ -n "${INSTALLKERNEL}" ]; then - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi -fi - -# Default install - -if [ "$(basename $2)" = "zImage" ]; then -# Compressed install - echo "Installing compressed kernel" - base=vmlinuz -else -# Normal install - echo "Installing normal kernel" - base=vmlinux -fi - -if [ -f $4/$base-$1 ]; then - mv $4/$base-$1 $4/$base-$1.old -fi -cat $2 > $4/$base-$1 - -# Install system map file -if [ -f $4/System.map-$1 ]; then - mv $4/System.map-$1 $4/System.map-$1.old -fi -cp $3 $4/System.map-$1
Parisc has two similar installation scripts: arch/parisc/install.sh arch/parisc/boot/install.sh The latter is never used because 'make ARCH=parisc install' always invokes the 'install' target in arch/parisc/Makefile. The target in arch/parisc/boot/Makefile is not used either. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- Changes in v2: - Remove arch/parisc/boot/install.sh arch/parisc/boot/Makefile | 4 --- arch/parisc/boot/install.sh | 65 ------------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 arch/parisc/boot/install.sh