From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>
Cc: linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-ia64@vger.kernel.org
Subject: [PATCH 11/20] kbuild: ia64: use common install script
Date: Wed, 7 Apr 2021 07:34:10 +0200 [thread overview]
Message-ID: <20210407053419.449796-12-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20210407053419.449796-1-gregkh@linuxfoundation.org>
The common scripts/install.sh script will now work for ia64, all that
is needed is to add the compressed image type to it. So add that file
type check and the ability to call /usr/sbin/elilo after copying the
kernel. With that we can remove the ia64-only version of the file.
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/ia64/Makefile | 2 +-
arch/ia64/install.sh | 40 ----------------------------------------
scripts/install.sh | 8 +++++++-
3 files changed, 8 insertions(+), 42 deletions(-)
delete mode 100644 arch/ia64/install.sh
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 467b7e7f967c..19e20e99f487 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -77,7 +77,7 @@ archheaders:
CLEAN_FILES += vmlinux.gz
install: vmlinux.gz
- sh $(srctree)/arch/ia64/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
+ sh $(srctree)/scripts/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
define archhelp
echo '* compressed - Build compressed kernel image'
diff --git a/arch/ia64/install.sh b/arch/ia64/install.sh
deleted file mode 100644
index 0e932f5dcd1a..000000000000
--- a/arch/ia64/install.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# arch/ia64/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 ia64 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
-
-# Default install - same as make zlilo
-
-if [ -f $4/vmlinuz ]; then
- mv $4/vmlinuz $4/vmlinuz.old
-fi
-
-if [ -f $4/System.map ]; then
- mv $4/System.map $4/System.old
-fi
-
-cat $2 > $4/vmlinuz
-cp $3 $4/System.map
-
-test -x /usr/sbin/elilo && /usr/sbin/elilo
diff --git a/scripts/install.sh b/scripts/install.sh
index 73067b535ea0..b6ca2a0f0983 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -52,6 +52,7 @@ if [ -x /sbin/"${INSTALLKERNEL}" ]; then exec /sbin/"${INSTALLKERNEL}" "$@"; fi
base=$(basename "$2")
if [ "$base" = "bzImage" ] ||
[ "$base" = "Image.gz" ] ||
+ [ "$base" = "vmlinux.gz" ] ||
[ "$base" = "zImage" ] ; then
# Compressed install
echo "Installing compressed kernel"
@@ -65,7 +66,7 @@ fi
# Some architectures name their files based on version number, and
# others do not. Call out the ones that do not to make it obvious.
case "${ARCH}" in
- x86)
+ ia64 | x86)
version=""
;;
*)
@@ -86,6 +87,11 @@ case "${ARCH}" in
echo "You have to install it yourself"
fi
;;
+ ia64)
+ if [ -x /usr/sbin/elilo ]; then
+ /usr/sbin/elilo
+ fi
+ ;;
x86)
if [ -x /sbin/lilo ]; then
/sbin/lilo
--
2.31.1
next prev parent reply other threads:[~2021-04-07 5:35 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 5:33 [PATCH 00/20] kbuild: unify the install.sh script usage Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 01/20] kbuild: move x86 install script to scripts/install.sh Greg Kroah-Hartman
2021-04-09 3:08 ` Kees Cook
2021-04-07 5:34 ` [PATCH 02/20] kbuild: scripts/install.sh: properly quote all variables Greg Kroah-Hartman
2021-04-07 10:59 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 03/20] kbuild: scripts/install.sh: provide a "install" function Greg Kroah-Hartman
2021-04-07 11:01 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 04/20] kbuild: scripts/install.sh: call sync before calling the bootloader installer Greg Kroah-Hartman
2021-04-07 11:03 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 05/20] kbuild: scripts/install.sh: prepare for arch-specific bootloaders Greg Kroah-Hartman
2021-04-09 3:08 ` Kees Cook
2021-04-07 5:34 ` [PATCH 06/20] kbuild: scripts/install.sh: handle compressed/uncompressed kernel images Greg Kroah-Hartman
2021-04-07 11:04 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 07/20] kbuild: scripts/install.sh: allow for the version number Greg Kroah-Hartman
2021-04-07 11:05 ` Masahiro Yamada
2021-04-07 13:03 ` Greg Kroah-Hartman
2021-04-07 13:21 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 08/20] kbuild: riscv: use common install script Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 09/20] kbuild: arm64: " Greg Kroah-Hartman
2021-04-07 14:30 ` Catalin Marinas
2021-04-09 3:08 ` Kees Cook
2021-04-09 6:37 ` Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 10/20] kbuild: arm: " Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` Greg Kroah-Hartman [this message]
2021-04-07 18:02 ` [PATCH 11/20] kbuild: ia64: " Sergei Trofimovich
2021-04-09 3:10 ` Kees Cook
2021-04-07 5:34 ` [PATCH 12/20] kbuild: m68k: " Greg Kroah-Hartman
2021-04-07 7:19 ` Geert Uytterhoeven
2021-04-09 3:10 ` Kees Cook
2021-04-07 5:34 ` [PATCH 13/20] kbuild: nds32: convert to use the common install scripts Greg Kroah-Hartman
2021-04-07 11:20 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 14/20] kbuild: nios2: use common install script Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 15/20] kbuild: parisc: " Greg Kroah-Hartman
2021-04-07 11:23 ` Masahiro Yamada
2021-04-14 16:30 ` Helge Deller
2021-04-14 17:51 ` Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 16/20] kbuild: powerpc: " Greg Kroah-Hartman
2021-04-07 11:32 ` Masahiro Yamada
2021-04-07 5:34 ` [PATCH 17/20] kbuild: s390: " Greg Kroah-Hartman
2021-04-07 12:15 ` Heiko Carstens
2021-04-09 3:10 ` Kees Cook
2021-04-07 5:34 ` [PATCH 18/20] kbuild: sh: remove unused " Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-08-24 15:22 ` Masahiro Yamada
2021-08-27 14:02 ` Greg Kroah-Hartman
2021-04-07 5:34 ` [PATCH 19/20] kbuild: sparc: use common " Greg Kroah-Hartman
2021-04-09 3:09 ` Kees Cook
2021-04-07 5:34 ` [PATCH 20/20] kbuild: scripts/install.sh: update documentation Greg Kroah-Hartman
2021-04-07 11:45 ` Masahiro Yamada
2021-04-07 7:18 ` [PATCH 00/20] kbuild: unify the install.sh script usage Geert Uytterhoeven
2021-04-07 7:46 ` Greg Kroah-Hartman
2021-04-07 8:02 ` Russell King - ARM Linux admin
2021-04-07 8:07 ` Greg Kroah-Hartman
2021-04-07 8:14 ` Russell King - ARM Linux admin
2021-04-07 8:37 ` Greg Kroah-Hartman
2021-04-07 10:53 ` Masahiro Yamada
2021-04-09 3:12 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210407053419.449796-12-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).