The sh arch has a install.sh script, but no Makefile actually calls it.
Remove it to keep anyone from accidentally calling it in the future.
Cc: Yoshinori Sato <[email protected]>
Cc: Rich Felker <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/sh/boot/compressed/install.sh | 56 ------------------------------
1 file changed, 56 deletions(-)
delete mode 100644 arch/sh/boot/compressed/install.sh
diff --git a/arch/sh/boot/compressed/install.sh b/arch/sh/boot/compressed/install.sh
deleted file mode 100644
index f9f41818b17e..000000000000
--- a/arch/sh/boot/compressed/install.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# arch/sh/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
-# Adapted from code in arch/i386/boot/install.sh by Russell King
-# Adapted from code in arch/arm/boot/install.sh by Stuart Menefy
-#
-# "make install" script for sh 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 /sbin/${INSTALLKERNEL} ]; then
- exec /sbin/${INSTALLKERNEL} "$@"
-fi
-
-if [ "$2" = "zImage" ]; then
-# Compressed install
- echo "Installing compressed kernel"
- if [ -f $4/vmlinuz-$1 ]; then
- mv $4/vmlinuz-$1 $4/vmlinuz.old
- fi
-
- if [ -f $4/System.map-$1 ]; then
- mv $4/System.map-$1 $4/System.old
- fi
-
- cat $2 > $4/vmlinuz-$1
- cp $3 $4/System.map-$1
-else
-# Normal install
- echo "Installing normal kernel"
- if [ -f $4/vmlinux-$1 ]; then
- mv $4/vmlinux-$1 $4/vmlinux.old
- fi
-
- if [ -f $4/System.map ]; then
- mv $4/System.map $4/System.old
- fi
-
- cat $2 > $4/vmlinux-$1
- cp $3 $4/System.map
-fi
--
2.31.1
On Wed, Apr 07, 2021 at 07:34:17AM +0200, Greg Kroah-Hartman wrote:
> The sh arch has a install.sh script, but no Makefile actually calls it.
> Remove it to keep anyone from accidentally calling it in the future.
>
> Cc: Yoshinori Sato <[email protected]>
> Cc: Rich Felker <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
--
Kees Cook
On Wed, Apr 7, 2021 at 2:35 PM Greg Kroah-Hartman
<[email protected]> wrote:
>
> The sh arch has a install.sh script, but no Makefile actually calls it.
> Remove it to keep anyone from accidentally calling it in the future.
>
> Cc: Yoshinori Sato <[email protected]>
> Cc: Rich Felker <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> arch/sh/boot/compressed/install.sh | 56 ------------------------------
> 1 file changed, 56 deletions(-)
> delete mode 100644 arch/sh/boot/compressed/install.sh
>
> diff --git a/arch/sh/boot/compressed/install.sh b/arch/sh/boot/compressed/install.sh
> deleted file mode 100644
> index f9f41818b17e..000000000000
> --- a/arch/sh/boot/compressed/install.sh
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -#!/bin/sh
> -#
> -# arch/sh/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
> -# Adapted from code in arch/i386/boot/install.sh by Russell King
> -# Adapted from code in arch/arm/boot/install.sh by Stuart Menefy
> -#
> -# "make install" script for sh 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 /sbin/${INSTALLKERNEL} ]; then
> - exec /sbin/${INSTALLKERNEL} "$@"
> -fi
> -
> -if [ "$2" = "zImage" ]; then
> -# Compressed install
> - echo "Installing compressed kernel"
> - if [ -f $4/vmlinuz-$1 ]; then
> - mv $4/vmlinuz-$1 $4/vmlinuz.old
> - fi
> -
> - if [ -f $4/System.map-$1 ]; then
> - mv $4/System.map-$1 $4/System.old
> - fi
> -
> - cat $2 > $4/vmlinuz-$1
> - cp $3 $4/System.map-$1
> -else
> -# Normal install
> - echo "Installing normal kernel"
> - if [ -f $4/vmlinux-$1 ]; then
> - mv $4/vmlinux-$1 $4/vmlinux.old
> - fi
> -
> - if [ -f $4/System.map ]; then
> - mv $4/System.map $4/System.old
> - fi
> -
> - cat $2 > $4/vmlinux-$1
> - cp $3 $4/System.map
> -fi
> --
> 2.31.1
>
This one is applicable independently.
Applied to linux-kbuild. Thanks.
--
Best Regards
Masahiro Yamada
On Wed, Aug 25, 2021 at 12:22:03AM +0900, Masahiro Yamada wrote:
> On Wed, Apr 7, 2021 at 2:35 PM Greg Kroah-Hartman
> <[email protected]> wrote:
> >
> > The sh arch has a install.sh script, but no Makefile actually calls it.
> > Remove it to keep anyone from accidentally calling it in the future.
> >
> > Cc: Yoshinori Sato <[email protected]>
> > Cc: Rich Felker <[email protected]>
> > Cc: [email protected]
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > ---
> > arch/sh/boot/compressed/install.sh | 56 ------------------------------
> > 1 file changed, 56 deletions(-)
> > delete mode 100644 arch/sh/boot/compressed/install.sh
> >
> > diff --git a/arch/sh/boot/compressed/install.sh b/arch/sh/boot/compressed/install.sh
> > deleted file mode 100644
> > index f9f41818b17e..000000000000
> > --- a/arch/sh/boot/compressed/install.sh
> > +++ /dev/null
> > @@ -1,56 +0,0 @@
> > -#!/bin/sh
> > -#
> > -# arch/sh/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
> > -# Adapted from code in arch/i386/boot/install.sh by Russell King
> > -# Adapted from code in arch/arm/boot/install.sh by Stuart Menefy
> > -#
> > -# "make install" script for sh 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 /sbin/${INSTALLKERNEL} ]; then
> > - exec /sbin/${INSTALLKERNEL} "$@"
> > -fi
> > -
> > -if [ "$2" = "zImage" ]; then
> > -# Compressed install
> > - echo "Installing compressed kernel"
> > - if [ -f $4/vmlinuz-$1 ]; then
> > - mv $4/vmlinuz-$1 $4/vmlinuz.old
> > - fi
> > -
> > - if [ -f $4/System.map-$1 ]; then
> > - mv $4/System.map-$1 $4/System.old
> > - fi
> > -
> > - cat $2 > $4/vmlinuz-$1
> > - cp $3 $4/System.map-$1
> > -else
> > -# Normal install
> > - echo "Installing normal kernel"
> > - if [ -f $4/vmlinux-$1 ]; then
> > - mv $4/vmlinux-$1 $4/vmlinux.old
> > - fi
> > -
> > - if [ -f $4/System.map ]; then
> > - mv $4/System.map $4/System.old
> > - fi
> > -
> > - cat $2 > $4/vmlinux-$1
> > - cp $3 $4/System.map
> > -fi
> > --
> > 2.31.1
> >
>
>
> This one is applicable independently.
>
> Applied to linux-kbuild. Thanks.
Hey, nice, thanks!
I'll work on the rest of the patches in this series after the next merge
window is over...
greg k-h