From patchwork Wed Apr 7 05:34:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 12186871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76C9FC433ED for ; Wed, 7 Apr 2021 05:37:14 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E65A613AF for ; Wed, 7 Apr 2021 05:37:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E65A613AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+SNXzxts+KUyXZC9jPBF19KBzmdFNAVKrjOKmicRV7E=; b=Pi2q0wQmf1ZJr6ehzDZHgcuNh klv2hEn2e5OwQqlYfSoW+jwrzuFcfcl21GeAlSquV5B4MpzXX9vABqvKBof2JktqPVjSU1gw1lvTb OIVOLloa4h0n2T1qxSIwrycfsr3S1PJUmjqA3thuQUCuEFUATBn9DAWWph0HnzdsdNNOK0CbknfoH N7vMJ4QCSNgSpgdeKRQyAQAF3SUOZ/de6Si+1bT4HYKYHuOSdQEnFJHD0YM7OywyZzYXN4/Mx5ANM g1nrkuVu3Gb2Rs+Ekp7qKFmSulU2TVEUBlrkf7yFhfTn1uxS0MRsubT/AdBn66b0MUrzs110QAE4t kh+A3qTDQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lU0qj-0048Dr-5L; Wed, 07 Apr 2021 05:35:33 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lU0qX-0048BT-FJ for linux-arm-kernel@lists.infradead.org; Wed, 07 Apr 2021 05:35:25 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9B23C613D2; Wed, 7 Apr 2021 05:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617773720; bh=0239ZVpF/A0+KAxcPRCh+JViWwBs7E9YBWSypoFdFGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KK6F79PilecPNNzW3JoxL/ZfHPwDWHnJyH/G91ybdZ/RdhIng3E/56ZLN2QtAzcV2 2tgQc/r7vPMaGcHn2B2dyFQj19zluQH2qaGdIbTaVoQia73bXrOeRZru4S4BJ+9SdU J/AkzuxD5gi66yBujOlHRaZbwPBT50rbLYarDxHE= From: Greg Kroah-Hartman To: Masahiro Yamada , Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/20] kbuild: arm: use common install script Date: Wed, 7 Apr 2021 07:34:09 +0200 Message-Id: <20210407053419.449796-11-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210407053419.449796-1-gregkh@linuxfoundation.org> References: <20210407053419.449796-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210407_063522_212198_480513E8 X-CRM114-Status: GOOD ( 16.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The common scripts/install.sh script will now work for arm, all that is needed is to add the compressed image type to it. So add that file type check and the ability to call /sbin/loadmap after copying the kernel. With that we can remove the arm-only version of the file. Cc: Russell King Cc: Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Greg Kroah-Hartman Reviewed-by: Kees Cook --- arch/arm/boot/Makefile | 6 ++-- arch/arm/boot/install.sh | 66 ---------------------------------------- scripts/install.sh | 10 +++++- 3 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 arch/arm/boot/install.sh diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 0b3cd7a33a26..053187f0b714 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -104,15 +104,15 @@ initrd: (echo You must specify INITRD; exit -1) 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)/zImage System.map "$(INSTALL_PATH)" uinstall: - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh "$(KERNELRELEASE)" \ $(obj)/uImage System.map "$(INSTALL_PATH)" subdir- := bootp compressed dts diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh deleted file mode 100644 index 2a45092a40e3..000000000000 --- a/arch/arm/boot/install.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# arch/arm/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 arm architecture -# -# 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)" = "zImage" ]; 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 - -if [ -x /sbin/loadmap ]; then - /sbin/loadmap -else - echo "You have to install it yourself" -fi diff --git a/scripts/install.sh b/scripts/install.sh index 9c8a22d96255..73067b535ea0 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -51,7 +51,8 @@ if [ -x /sbin/"${INSTALLKERNEL}" ]; then exec /sbin/"${INSTALLKERNEL}" "$@"; fi base=$(basename "$2") if [ "$base" = "bzImage" ] || - [ "$base" = "Image.gz" ] ; then + [ "$base" = "Image.gz" ] || + [ "$base" = "zImage" ] ; then # Compressed install echo "Installing compressed kernel" base=vmlinuz @@ -78,6 +79,13 @@ sync # Some architectures like to call specific bootloader "helper" programs: case "${ARCH}" in + arm) + if [ -x /sbin/loadmap ]; then + /sbin/loadmap + else + echo "You have to install it yourself" + fi + ;; x86) if [ -x /sbin/lilo ]; then /sbin/lilo