* [PATCH 17/20] kbuild: s390: use common install script
[not found] <20210407053419.449796-1-gregkh@linuxfoundation.org>
@ 2021-04-07 5:34 ` Greg Kroah-Hartman
2021-04-07 12:15 ` Heiko Carstens
2021-04-09 3:10 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2021-04-07 5:34 UTC (permalink / raw)
To: Masahiro Yamada, Michal Marek
Cc: linux-kbuild, linux-arch, linux-kernel, Greg Kroah-Hartman,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-s390
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
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
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 17/20] kbuild: s390: use common install script
2021-04-07 5:34 ` [PATCH 17/20] kbuild: s390: use common install script Greg Kroah-Hartman
@ 2021-04-07 12:15 ` Heiko Carstens
2021-04-09 3:10 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Heiko Carstens @ 2021-04-07 12:15 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Masahiro Yamada, Michal Marek, linux-kbuild, linux-arch,
linux-kernel, Vasily Gorbik, Christian Borntraeger, linux-s390
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 17/20] kbuild: s390: use common install script
2021-04-07 5:34 ` [PATCH 17/20] kbuild: s390: use common install script Greg Kroah-Hartman
2021-04-07 12:15 ` Heiko Carstens
@ 2021-04-09 3:10 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2021-04-09 3:10 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Masahiro Yamada, Michal Marek, linux-kbuild, linux-arch,
linux-kernel, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger, linux-s390
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>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-09 3:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210407053419.449796-1-gregkh@linuxfoundation.org>
2021-04-07 5:34 ` [PATCH 17/20] kbuild: s390: use common install script Greg Kroah-Hartman
2021-04-07 12:15 ` Heiko Carstens
2021-04-09 3:10 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox