All of lore.kernel.org
 help / color / mirror / Atom feed
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>
Subject: [PATCH 03/20] kbuild: scripts/install.sh: provide a "install" function
Date: Wed,  7 Apr 2021 07:34:02 +0200	[thread overview]
Message-ID: <20210407053419.449796-4-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20210407053419.449796-1-gregkh@linuxfoundation.org>

Instead of open-coding the "test for file, if present make a backup,
then copy the file to the new location" in multiple places, make a
single function, install(), to do all of this in one place.

Note, this does change the default x86 kernel map file saved name from
"System.old" to "System.map.old".  This brings it into unification with
the other architectures as to what they call their backup file for the
kernel map file.  As this is a text file, and nothing parses this from a
backup file, there should not be any operational differences.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 scripts/install.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index c183d6ddd00c..af36c0a82f01 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -27,6 +27,19 @@ verify () {
  	fi
 }
 
+install () {
+	install_source=${1}
+	install_target=${2}
+
+	echo "installing '${install_source}' to '${install_target}'"
+
+	# if the target is already present, move it to a .old filename
+	if [ -f "${install_target}" ]; then
+		mv "${install_target}" "${install_target}".old
+	fi
+	cat "${install_source}" > "${install_target}"
+}
+
 # Make sure the files actually exist
 verify "$2"
 verify "$3"
@@ -37,17 +50,8 @@ 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
+install "$2" "$4"/vmlinuz
+install "$3" "$4"/System.map
 
 if [ -x /sbin/lilo ]; then
        /sbin/lilo
-- 
2.31.1


  parent reply	other threads:[~2021-04-07  5:34 UTC|newest]

Thread overview: 70+ 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 ` Greg Kroah-Hartman [this message]
2021-04-07 11:01   ` [PATCH 03/20] kbuild: scripts/install.sh: provide a "install" function 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-07  5:34   ` Greg Kroah-Hartman
2021-04-09  3:09   ` Kees Cook
2021-04-09  3:09     ` Kees Cook
2021-04-07  5:34 ` [PATCH 09/20] kbuild: arm64: " Greg Kroah-Hartman
2021-04-07  5:34   ` Greg Kroah-Hartman
2021-04-07 14:30   ` Catalin Marinas
2021-04-07 14:30     ` Catalin Marinas
2021-04-09  3:08   ` Kees Cook
2021-04-09  3:08     ` Kees Cook
2021-04-09  6:37     ` Greg Kroah-Hartman
2021-04-09  6:37       ` Greg Kroah-Hartman
2021-04-07  5:34 ` [PATCH 10/20] kbuild: arm: " Greg Kroah-Hartman
2021-04-07  5:34   ` Greg Kroah-Hartman
2021-04-09  3:09   ` Kees Cook
2021-04-09  3:09     ` Kees Cook
2021-04-07  5:34 ` [PATCH 11/20] kbuild: ia64: " Greg Kroah-Hartman
2021-04-07 18:02   ` 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  5:34   ` Greg Kroah-Hartman
2021-04-07 11:32   ` Masahiro Yamada
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-4-gregkh@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=michal.lkml@markovi.net \
    --subject='Re: [PATCH 03/20] kbuild: scripts/install.sh: provide a "install" function' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.