| Message ID | 20210407053419.449796-18-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: unify the install.sh script usage | expand |
On Wed, Apr 07, 2021 at 07:34:16AM +0200, Greg Kroah-Hartman wrote: > The common scripts/install.sh script will now work for s390, no changes > needed. So call that instead and delete the s390-only install script. > > Cc: Heiko Carstens <hca@linux.ibm.com> > Cc: Vasily Gorbik <gor@linux.ibm.com> > Cc: Christian Borntraeger <borntraeger@de.ibm.com> > Cc: linux-s390@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > arch/s390/boot/Makefile | 2 +- > arch/s390/boot/install.sh | 30 ------------------------------ > 2 files changed, 1 insertion(+), 31 deletions(-) > delete mode 100644 arch/s390/boot/install.sh Acked-by: Heiko Carstens <hca@linux.ibm.com>
On Wed, Apr 07, 2021 at 07:34:16AM +0200, Greg Kroah-Hartman wrote: > The common scripts/install.sh script will now work for s390, no changes > needed. So call that instead and delete the s390-only install script. > > Cc: Heiko Carstens <hca@linux.ibm.com> > Cc: Vasily Gorbik <gor@linux.ibm.com> > Cc: Christian Borntraeger <borntraeger@de.ibm.com> > Cc: linux-s390@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Kees Cook <keescook@chromium.org>
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile index 41a64b8dce25..5e3058d6e59b 100644 --- a/arch/s390/boot/Makefile +++ b/arch/s390/boot/Makefile @@ -71,5 +71,5 @@ $(obj)/startup.a: $(OBJECTS) FORCE $(call if_changed,ar) install: - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ + sh -x $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \ System.map "$(INSTALL_PATH)" diff --git a/arch/s390/boot/install.sh b/arch/s390/boot/install.sh deleted file mode 100644 index 515b27a996b3..000000000000 --- a/arch/s390/boot/install.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# -# arch/s390x/boot/install.sh -# -# Copyright (C) 1995 by Linus Torvalds -# -# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin -# -# "make install" script for s390 architecture -# -# Arguments: -# $1 - kernel version -# $2 - kernel image file -# $3 - kernel map file -# $4 - default install path (blank if root directory) -# - -# User may have a custom install script - -if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi -if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi - -echo "Warning: '${INSTALLKERNEL}' command not available - additional " \ - "bootloader config required" >&2 -if [ -f $4/vmlinuz-$1 ]; then mv $4/vmlinuz-$1 $4/vmlinuz-$1.old; fi -if [ -f $4/System.map-$1 ]; then mv $4/System.map-$1 $4/System.map-$1.old; fi - -cat $2 > $4/vmlinuz-$1 -cp $3 $4/System.map-$1
The common scripts/install.sh script will now work for s390, no changes needed. So call that instead and delete the s390-only install script. Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: linux-s390@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/s390/boot/Makefile | 2 +- arch/s390/boot/install.sh | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 arch/s390/boot/install.sh