Skip to contentSkip to conversation

scripts: add generic install.sh

PATCH In review Masahiro Yamada 2 participants 3 messages Aug 24, 2021 – Aug 27, 2021 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts: add generic install.sh

Many architectures has a similar install.sh script.

The first half is really generic; ensures the kernel image and the map file exist, then invokes ~/bin/${INSTALLKERNEL} or /sbin/${INSTALLKERNEL} if available.

The second half is kind of arch-specific. It just copies the kernel image and map file to the destination, but the code is slightly different. (Maybe, this part can be consolidated as well if we want).

This patch factors out the generic part into scripts/install.sh, which will architectures to drop the duplicated code.

---

 Makefile           |  8 ++++++++
 scripts/install.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100755 scripts/install.sh
Makefile +8 -0
index 185ce47d6734..725eadc4fcb8 100644
@@ -1325,6 +1325,14 @@ scripts_unifdef: scripts_basic
 
 install: sub_make_done :=
 
+# Install $(KBUILD_IMAGE) by default.
+# If necessary, override install-image per target.
+install-image = $(KBUILD_IMAGE)
+
+quiet_cmd_install = INSTALL $(INSTALL_PATH)
+      cmd_install = scripts/install.sh $(KERNELRELEASE) $(install-image) \
+			System.map "$(INSTALL_PATH)"
+
 # ---------------------------------------------------------------------------
 # Tools
 
scripts/install.sh new file +43 -0

43 lines not on this page · raw message

Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Wed, 25 Aug 2021 01:50:24 +0900 Masahiro Yamada wrote:

Many architectures has a similar install.sh script.

The first half is really generic; ensures the kernel image and the map file exist, then invokes ~/bin/${INSTALLKERNEL} or /sbin/${INSTALLKERNEL} if available.

Quoted 6 lines

The second half is kind of arch-specific. It just copies the kernel image and map file to the destination, but the code is slightly different. (Maybe, this part can be consolidated as well if we want).

This patch factors out the generic part into scripts/install.sh, which will architectures to drop the duplicated code.

      ^

I am afraid, a word is missing here, e.g.:
... which will allow architectures to drop ...?

Quoted 58 lines

---

 Makefile           |  8 ++++++++
 scripts/install.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100755 scripts/install.sh
Makefile +8 -0
index 185ce47d6734..725eadc4fcb8 100644
@@ -1325,6 +1325,14 @@ scripts_unifdef: scripts_basic
 
 install: sub_make_done :=
 
+# Install $(KBUILD_IMAGE) by default.
+# If necessary, override install-image per target.
+install-image = $(KBUILD_IMAGE)
+
+quiet_cmd_install = INSTALL $(INSTALL_PATH)
+      cmd_install = scripts/install.sh $(KERNELRELEASE) $(install-image) \
+			System.map "$(INSTALL_PATH)"
+
 # ---------------------------------------------------------------------------
 # Tools
 
scripts/install.sh new file +24 -0
new file mode 100755
index 000000000000..6ac0e0c0f078
@@ -0,0 +1,43 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# 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
+#
+# Arguments:
+#   $1 - kernel version
+#   $2 - kernel image file
+#   $3 - kernel map file
+#   $4 - default install path (blank if root directory)
+
+verify () {
+	if [ ! -f "$1" ]; then
+		echo >&2
+		echo >&2 " *** Missing file: $1"
+		echo >&2 ' *** You need to run "make" before "make install".'
+		echo >&2
+		exit 1

scripts/install.sh line 34

Quoted 10 lines
scripts/install.sh new file +10 -0
+	fi
+}
+
+# Make sure the files actually exist
+verify "$2"
+verify "$3"
+
+# User/arch may have a custom install script
+
+for script in "~/bin/${INSTALLKERNEL}" "/sbin/${INSTALLKERNEL}" \

Quoted ~ will not be expanded. Either you need to put the leading ~/ before the quotes, or replace it by ${HOME}.

Quoted 12 lines
scripts/install.sh new file +9 -0
+		"arch/${SRCARCH}/install.sh" "arch/${SRCARCH}/boot/install.sh"
+do
+	if [ -x "${script}" ]; then
+		exec "${script}" "$@"
+	fi
+done
+
+echo "No install script found" >&2
+exit 1
Signature · 1 line
2.30.2
#2 lore raw
Quoted 12 lines · Nicolas Schier
Quoted 10 lines · On Wed, 25 Aug 2021 01:50:24 +0900 Masahiro Yamada wrote:

Many architectures has a similar install.sh script.

The first half is really generic; ensures the kernel image and the map file exist, then invokes ~/bin/${INSTALLKERNEL} or /sbin/${INSTALLKERNEL} if available.

The second half is kind of arch-specific. It just copies the kernel image and map file to the destination, but the code is slightly different. (Maybe, this part can be consolidated as well if we want).

Quoted 5 lines
Quoted 2 lines

This patch factors out the generic part into scripts/install.sh, which will architectures to drop the duplicated code.

      ^

I am afraid, a word is missing here, e.g.:
... which will allow architectures to drop ...?

Yes, I meant "will allow architectures to ..."
I just noticed after the submission.

Quoted 63 lines
Quoted 63 lines

---

 Makefile           |  8 ++++++++
 scripts/install.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100755 scripts/install.sh
Makefile +8 -0
index 185ce47d6734..725eadc4fcb8 100644
@@ -1325,6 +1325,14 @@ scripts_unifdef: scripts_basic
 
 install: sub_make_done :=
 
+# Install $(KBUILD_IMAGE) by default.
+# If necessary, override install-image per target.
+install-image = $(KBUILD_IMAGE)
+
+quiet_cmd_install = INSTALL $(INSTALL_PATH)
+      cmd_install = scripts/install.sh $(KERNELRELEASE) $(install-image) \
+                     System.map "$(INSTALL_PATH)"
+
 # ---------------------------------------------------------------------------
 # Tools
 
scripts/install.sh new file +29 -0
new file mode 100755
index 000000000000..6ac0e0c0f078
@@ -0,0 +1,43 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# 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
+#
+# Arguments:
+#   $1 - kernel version
+#   $2 - kernel image file
+#   $3 - kernel map file
+#   $4 - default install path (blank if root directory)
+
+verify () {
+     if [ ! -f "$1" ]; then
+             echo >&2
+             echo >&2 " *** Missing file: $1"
+             echo >&2 ' *** You need to run "make" before "make install".'
+             echo >&2
+             exit 1
+     fi
+}
+
+# Make sure the files actually exist
+verify "$2"
Quoted 8 lines

scripts/install.sh line 34

Quoted 5 lines
scripts/install.sh new file +5 -0
+verify "$3"
+
+# User/arch may have a custom install script
+
+for script in "~/bin/${INSTALLKERNEL}" "/sbin/${INSTALLKERNEL}" \

Quoted ~ will not be expanded. Either you need to put the leading ~/ before the quotes, or replace it by ${HOME}.

A good catch, thank you.

Quoted 15 lines
Quoted 12 lines
scripts/install.sh new file +9 -1
+             "arch/${SRCARCH}/install.sh" "arch/${SRCARCH}/boot/install.sh"
+do
+     if [ -x "${script}" ]; then
+             exec "${script}" "$@"
+     fi
+done
+
+echo "No install script found" >&2
+exit 1
--

2.30.2

Signature · 2 lines
Best Regards
Masahiro Yamada