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>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/20] kbuild: arm64: use common install script Date: Wed, 7 Apr 2021 07:34:08 +0200 [thread overview] Message-ID: <20210407053419.449796-10-gregkh@linuxfoundation.org> (raw) In-Reply-To: <20210407053419.449796-1-gregkh@linuxfoundation.org> The common scripts/install.sh script will now work for arm65, no changes needed so convert the arm64 boot Makefile to call it instead of the arm64-only version of the file and remove the now unused file. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/arm64/boot/Makefile | 4 +-- arch/arm64/boot/install.sh | 60 -------------------------------------- 2 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 arch/arm64/boot/install.sh diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index cd3414898d10..08c56332dde2 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -37,9 +37,9 @@ $(obj)/Image.lzo: $(obj)/Image FORCE $(call if_changed,lzo) install: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \ $(obj)/Image System.map "$(INSTALL_PATH)" zinstall: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \ $(obj)/Image.gz System.map "$(INSTALL_PATH)" diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh deleted file mode 100644 index d91e1f022573..000000000000 --- a/arch/arm64/boot/install.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# arch/arm64/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 -# -# "make install" script for the AArch64 Linux port -# -# 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 "" 1>&2 - echo " *** Missing file: $1" 1>&2 - echo ' *** You need to run "make" before "make install".' 1>&2 - echo "" 1>&2 - exit 1 - fi -} - -# Make sure the files actually exist -verify "$2" -verify "$3" - -# 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 - -if [ "$(basename $2)" = "Image.gz" ]; then -# Compressed install - echo "Installing compressed kernel" - base=vmlinuz -else -# Normal install - echo "Installing normal kernel" - base=vmlinux -fi - -if [ -f $4/$base-$1 ]; then - mv $4/$base-$1 $4/$base-$1.old -fi -cat $2 > $4/$base-$1 - -# Install system map file -if [ -f $4/System.map-$1 ]; then - mv $4/System.map-$1 $4/System.map-$1.old -fi -cp $3 $4/System.map-$1 -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
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>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/20] kbuild: arm64: use common install script Date: Wed, 7 Apr 2021 07:34:08 +0200 [thread overview] Message-ID: <20210407053419.449796-10-gregkh@linuxfoundation.org> (raw) In-Reply-To: <20210407053419.449796-1-gregkh@linuxfoundation.org> The common scripts/install.sh script will now work for arm65, no changes needed so convert the arm64 boot Makefile to call it instead of the arm64-only version of the file and remove the now unused file. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/arm64/boot/Makefile | 4 +-- arch/arm64/boot/install.sh | 60 -------------------------------------- 2 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 arch/arm64/boot/install.sh diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index cd3414898d10..08c56332dde2 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -37,9 +37,9 @@ $(obj)/Image.lzo: $(obj)/Image FORCE $(call if_changed,lzo) install: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \ $(obj)/Image System.map "$(INSTALL_PATH)" zinstall: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh $(KERNELRELEASE) \ $(obj)/Image.gz System.map "$(INSTALL_PATH)" diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh deleted file mode 100644 index d91e1f022573..000000000000 --- a/arch/arm64/boot/install.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# arch/arm64/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 -# -# "make install" script for the AArch64 Linux port -# -# 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 "" 1>&2 - echo " *** Missing file: $1" 1>&2 - echo ' *** You need to run "make" before "make install".' 1>&2 - echo "" 1>&2 - exit 1 - fi -} - -# Make sure the files actually exist -verify "$2" -verify "$3" - -# 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 - -if [ "$(basename $2)" = "Image.gz" ]; then -# Compressed install - echo "Installing compressed kernel" - base=vmlinuz -else -# Normal install - echo "Installing normal kernel" - base=vmlinux -fi - -if [ -f $4/$base-$1 ]; then - mv $4/$base-$1 $4/$base-$1.old -fi -cat $2 > $4/$base-$1 - -# Install system map file -if [ -f $4/System.map-$1 ]; then - mv $4/System.map-$1 $4/System.map-$1.old -fi -cp $3 $4/System.map-$1 -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-07 5:35 UTC|newest] Thread overview: 73+ 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-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 ` Greg Kroah-Hartman [this message] 2021-04-07 5:34 ` [PATCH 09/20] kbuild: arm64: " 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 5:34 ` Greg Kroah-Hartman 2021-04-07 18:02 ` Sergei Trofimovich 2021-04-07 18:02 ` Sergei Trofimovich 2021-04-09 3:10 ` Kees Cook 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-10-gregkh@linuxfoundation.org \ --to=gregkh@linuxfoundation.org \ --cc=catalin.marinas@arm.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=masahiroy@kernel.org \ --cc=michal.lkml@markovi.net \ --cc=will@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.