From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 77BEDC433B4 for ; Wed, 7 Apr 2021 11:33:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C00D61168 for ; Wed, 7 Apr 2021 11:33:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343809AbhDGLdY (ORCPT ); Wed, 7 Apr 2021 07:33:24 -0400 Received: from conssluserg-06.nifty.com ([210.131.2.91]:38375 "EHLO conssluserg-06.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343769AbhDGLdU (ORCPT ); Wed, 7 Apr 2021 07:33:20 -0400 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (authenticated) by conssluserg-06.nifty.com with ESMTP id 137BWpek018265; Wed, 7 Apr 2021 20:32:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 137BWpek018265 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1617795171; bh=YE/3jAmw6G8yCwpeiXzDgIBF5HNw+SmvWOFzgsI9ku8=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=OFB2zo1di8wMHF9IPuMJoFpQMSkFi6QtvaiuuJ1uO+r6HSGOoY/60HVV5/OPcpkkx AFYPXTBUIVE2yyvQOVBnWJs+16lHf2BM6f5yfsVT56LyibDEAkOXenWXv2mPasSEEv 9aMZUtRtSoJMuJD7zzFW9xgwJUJ3kWQ5E2T6ZeEt++g96C2fhpWjGcQuVojzJiy+Vt pANcAWFI2Ir4ab+9SxV4NGYR2+FzP43iy4eDmfa5GaXwcxKtrlPo6wUlbDPnao5PoQ s6iHlwO85gqYD7+jSxQ8oSw382PPfTw2nsnPPmCmdj9pUhqhOB/t7GTZYLi6JaCBRu hFQfwWfBpMSlA== X-Nifty-SrcIP: [209.85.215.176] Received: by mail-pg1-f176.google.com with SMTP id y32so9639670pga.11; Wed, 07 Apr 2021 04:32:51 -0700 (PDT) X-Gm-Message-State: AOAM530R9JpBH49uU6Wxg0ouQwNXWZVvrwwhGXcix7DR7yiKogk5VNdo rit9nDyb1lNpyUPFfL44hBXxnI7M1i2HJqWAaj8= X-Google-Smtp-Source: ABdhPJyX462+iXRWfux7Z4xGcPCP6UQgdQ1H4XYGHRU9N2d8fzIA6kG7uhIhickmK5JeHy1+bAt+KLzwLmX8di1BRdc= X-Received: by 2002:a65:41c6:: with SMTP id b6mr2830311pgq.7.1617795170674; Wed, 07 Apr 2021 04:32:50 -0700 (PDT) MIME-Version: 1.0 References: <20210407053419.449796-1-gregkh@linuxfoundation.org> <20210407053419.449796-17-gregkh@linuxfoundation.org> In-Reply-To: <20210407053419.449796-17-gregkh@linuxfoundation.org> From: Masahiro Yamada Date: Wed, 7 Apr 2021 20:32:13 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 16/20] kbuild: powerpc: use common install script To: Greg Kroah-Hartman , Michael Ellerman Cc: Michal Marek , Linux Kbuild mailing list , linux-arch , Linux Kernel Mailing List , linuxppc-dev Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 7, 2021 at 2:34 PM Greg Kroah-Hartman wrote: > > The common scripts/install.sh script will now work for powerpc, 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. > > After the kernel is installed, powerpc also likes to install a few > random files, so provide the ability to do that as well. > > With that we can remove the powerpc-only version of the install script. > > Cc: Michael Ellerman > Cc: linuxppc-dev@lists.ozlabs.org > Signed-off-by: Greg Kroah-Hartman > --- > arch/powerpc/boot/Makefile | 4 +-- > arch/powerpc/boot/install.sh | 55 ------------------------------------ > scripts/install.sh | 14 ++++++++- > 3 files changed, 15 insertions(+), 58 deletions(-) > delete mode 100644 arch/powerpc/boot/install.sh > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index 2b8da923ceca..bbfcbd33e0b7 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -442,11 +442,11 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) > > # Only install the vmlinux > install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) > - sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" > + sh -x $(srctree)/scripts/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" > > # Install the vmlinux and other built boot targets. > zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) > - sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^ > + sh -x $(srctree)/scripts/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^ I want comments from the ppc maintainers because this code is already broken. This 'zInstall' target is unreachable. See commit c913e5f95e546d8d3a9f99ba9908f7e095cbc1fb It added the new target 'zInstall', but it is not hooked anywhere. It is completely useless for 6 years, and nobody has pointed it out. So, I think nobody is caring about this broken code. One more thing, Kbuild does not recognize it as an installation target because the 'I' in 'zInstall' is a capital letter. The name of the installation target must be '*install', all letters in lower cases. > PHONY += install zInstall > > diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh > deleted file mode 100644 > index b6a256bc96ee..000000000000 > --- a/arch/powerpc/boot/install.sh > +++ /dev/null > @@ -1,55 +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 > -# > -# Blatantly stolen from in arch/i386/boot/install.sh by Dave Hansen > -# > -# "make install" script for ppc64 architecture > -# > -# Arguments: > -# $1 - kernel version > -# $2 - kernel image file > -# $3 - kernel map file > -# $4 - default install path (blank if root directory) > -# $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc. > -# > - > -# Bail with error code if anything goes wrong > -set -e > - > -# 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 > - > -# this should work for both the pSeries zImage and the iSeries vmlinux.sm > -image_name=`basename $2` > - > -if [ -f $4/$image_name ]; then > - mv $4/$image_name $4/$image_name.old > -fi > - > -if [ -f $4/System.map ]; then > - mv $4/System.map $4/System.old > -fi > - > -cat $2 > $4/$image_name > -cp $3 $4/System.map > - > -# Copy all the bootable image files > -path=$4 > -shift 4 > -while [ $# -ne 0 ]; do > - image_name=`basename $1` > - if [ -f $path/$image_name ]; then > - mv $path/$image_name $path/$image_name.old > - fi > - cat $1 > $path/$image_name > - shift > -done; > diff --git a/scripts/install.sh b/scripts/install.sh > index e0ffb95737d4..67c0a5f74af2 100644 > --- a/scripts/install.sh > +++ b/scripts/install.sh > @@ -67,7 +67,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 | nios2 | x86) > + ia64 | m68k | nios2 | powerpc | x86) > version="" > ;; > *) > @@ -93,6 +93,18 @@ case "${ARCH}" in > /usr/sbin/elilo > fi > ;; > + powerpc) > + # powerpc installation can list other boot targets after the > + # install path that should be copied to the correct location Perhaps, we can remove this if the ppc maintainers approve it ? > + path=$4 > + shift 4 > + while [ $# -ne 0 ]; do > + image_name=$(basename "$1") > + install "$1" "$path"/"$image_name" > + shift > + done; > + sync > + ;; > x86) > if [ -x /sbin/lilo ]; then > /sbin/lilo > -- > 2.31.1 > -- Best Regards Masahiro Yamada