From patchwork Wed Apr 7 05:34:13 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: 12186913 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 9F85FC43461 for ; Wed, 7 Apr 2021 05:35:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A877613CD for ; Wed, 7 Apr 2021 05:35:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242365AbhDGFf4 (ORCPT ); Wed, 7 Apr 2021 01:35:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:39246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345265AbhDGFfj (ORCPT ); Wed, 7 Apr 2021 01:35:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CAD0F613CD; Wed, 7 Apr 2021 05:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617773730; bh=gVgUNc4TLYn8Vpa0TphdO6IywdJAqWVWW8gaDGaAvFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kgm3lRqrWR6kDKh5cwFqnqt2fHOTTVTosrukRIUQ6AHTp4d2rcFu306xtK+MEAy2S GsDyKRsr/7P96nw4qEzXSv+QvjNIk351RfrQZTBK6Pghf8xgcCtVW6URGqjeeeX2IZ jvPiDclZyN5PAKihoixSBwluV18VhO6eYcEPEeHU= 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 , Ley Foon Tan Subject: [PATCH 14/20] kbuild: nios2: use common install script Date: Wed, 7 Apr 2021 07:34:13 +0200 Message-Id: <20210407053419.449796-15-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 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The common scripts/install.sh script will now work for nios2, all that is needed is to add it to the list of arches that do not put the version number in the installed file name. With that we can remove the nios2-only version of the install script. Cc: Ley Foon Tan Signed-off-by: Greg Kroah-Hartman Reviewed-by: Kees Cook --- arch/nios2/boot/Makefile | 2 +- arch/nios2/boot/install.sh | 52 -------------------------------------- scripts/install.sh | 2 +- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 arch/nios2/boot/install.sh diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile index 37dfc7e584bc..b8d8a3be156a 100644 --- a/arch/nios2/boot/Makefile +++ b/arch/nios2/boot/Makefile @@ -32,4 +32,4 @@ $(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ install: - sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" + sh $(srctree)/scripts/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" diff --git a/arch/nios2/boot/install.sh b/arch/nios2/boot/install.sh deleted file mode 100644 index 3cb3f468bc51..000000000000 --- a/arch/nios2/boot/install.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/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 nios2 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 - -# 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 - -sync diff --git a/scripts/install.sh b/scripts/install.sh index a61a5ce28cad..407ffa65062c 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -66,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 - ia64 | m68k | x86) + ia64 | m68k | nios2 | x86) version="" ;; *)