* [PATCH 15/20] kbuild: parisc: use common install script [not found] <20210407053419.449796-1-gregkh@linuxfoundation.org> @ 2021-04-07 5:34 ` Greg Kroah-Hartman 2021-04-07 11:23 ` Masahiro Yamada 0 siblings, 1 reply; 4+ messages in thread From: Greg Kroah-Hartman @ 2021-04-07 5:34 UTC (permalink / raw) To: Masahiro Yamada, Michal Marek Cc: linux-kbuild, linux-arch, linux-kernel, Greg Kroah-Hartman, James E.J. Bottomley, Helge Deller, linux-parisc The common scripts/install.sh script will now work for parisc, all that is needed is to add the compressed image type to it. So add that file type check, and then we can remove the two different copies of the parisc install.sh script that were only different by one line and have the arch call the common install script. Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/parisc/Makefile | 4 +-- arch/parisc/boot/Makefile | 2 +- arch/parisc/boot/install.sh | 65 ------------------------------------ arch/parisc/install.sh | 66 ------------------------------------- scripts/install.sh | 1 + 5 files changed, 4 insertions(+), 134 deletions(-) delete mode 100644 arch/parisc/boot/install.sh delete mode 100644 arch/parisc/install.sh diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 7d9f71aa829a..296d8ab8e2aa 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -164,10 +164,10 @@ vmlinuz: vmlinux endif install: - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ $(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)" zinstall: - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ $(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)" CLEAN_FILES += lifimage diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile index 61f44142cfe1..ad2611929aee 100644 --- a/arch/parisc/boot/Makefile +++ b/arch/parisc/boot/Makefile @@ -17,5 +17,5 @@ $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ install: $(CONFIGURE) $(obj)/bzImage - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ + sh -x $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \ System.map "$(INSTALL_PATH)" diff --git a/arch/parisc/boot/install.sh b/arch/parisc/boot/install.sh deleted file mode 100644 index 8f7c365fad83..000000000000 --- a/arch/parisc/boot/install.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -# arch/parisc/install.sh, derived from arch/i386/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 -# -# "make install" script for i386 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 [ -n "${INSTALLKERNEL}" ]; then - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi -fi - -# Default install - -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 diff --git a/arch/parisc/install.sh b/arch/parisc/install.sh deleted file mode 100644 index 056d588befdd..000000000000 --- a/arch/parisc/install.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# arch/parisc/install.sh, derived from arch/i386/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 -# -# "make install" script for i386 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 [ -n "${INSTALLKERNEL}" ]; then - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi -fi - -# Default install - -if [ "$(basename $2)" = "vmlinuz" ]; 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 - diff --git a/scripts/install.sh b/scripts/install.sh index 407ffa65062c..e0ffb95737d4 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -53,6 +53,7 @@ base=$(basename "$2") if [ "$base" = "bzImage" ] || [ "$base" = "Image.gz" ] || [ "$base" = "vmlinux.gz" ] || + [ "$base" = "vmlinuz" ] || [ "$base" = "zImage" ] ; then # Compressed install echo "Installing compressed kernel" -- 2.31.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 15/20] kbuild: parisc: use common install script 2021-04-07 5:34 ` [PATCH 15/20] kbuild: parisc: use common install script Greg Kroah-Hartman @ 2021-04-07 11:23 ` Masahiro Yamada 2021-04-14 16:30 ` Helge Deller 0 siblings, 1 reply; 4+ messages in thread From: Masahiro Yamada @ 2021-04-07 11:23 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Michal Marek, Linux Kbuild mailing list, linux-arch, Linux Kernel Mailing List, James E.J. Bottomley, Helge Deller, linux-parisc On Wed, Apr 7, 2021 at 2:34 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > The common scripts/install.sh script will now work for parisc, all that > is needed is to add the compressed image type to it. So add that file > type check, and then we can remove the two different copies of the > parisc install.sh script that were only different by one line and have > the arch call the common install script. > > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > Cc: Helge Deller <deller@gmx.de> > Cc: linux-parisc@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > arch/parisc/Makefile | 4 +-- > arch/parisc/boot/Makefile | 2 +- > arch/parisc/boot/install.sh | 65 ------------------------------------ > arch/parisc/install.sh | 66 ------------------------------------- > scripts/install.sh | 1 + > 5 files changed, 4 insertions(+), 134 deletions(-) > delete mode 100644 arch/parisc/boot/install.sh > delete mode 100644 arch/parisc/install.sh > > diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile > index 7d9f71aa829a..296d8ab8e2aa 100644 > --- a/arch/parisc/Makefile > +++ b/arch/parisc/Makefile > @@ -164,10 +164,10 @@ vmlinuz: vmlinux > endif > > install: > - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ > + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ > $(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)" > zinstall: > - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ > + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ > $(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)" > > CLEAN_FILES += lifimage > diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile > index 61f44142cfe1..ad2611929aee 100644 > --- a/arch/parisc/boot/Makefile > +++ b/arch/parisc/boot/Makefile > @@ -17,5 +17,5 @@ $(obj)/compressed/vmlinux: FORCE > $(Q)$(MAKE) $(build)=$(obj)/compressed $@ > > install: $(CONFIGURE) $(obj)/bzImage > - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ > + sh -x $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \ > System.map "$(INSTALL_PATH)" As far as I understood, there is no way to invoke this 'install' target in arch/parisc/boot/Makefile since everything is done by arch/parisc/Makefile. Can we remove this 'install' rule entirely? > diff --git a/arch/parisc/boot/install.sh b/arch/parisc/boot/install.sh > deleted file mode 100644 > index 8f7c365fad83..000000000000 > --- a/arch/parisc/boot/install.sh > +++ /dev/null > @@ -1,65 +0,0 @@ > -#!/bin/sh > -# > -# arch/parisc/install.sh, derived from arch/i386/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 > -# > -# "make install" script for i386 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 [ -n "${INSTALLKERNEL}" ]; then > - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi > - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi > -fi > - > -# Default install > - > -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 > diff --git a/arch/parisc/install.sh b/arch/parisc/install.sh > deleted file mode 100644 > index 056d588befdd..000000000000 > --- a/arch/parisc/install.sh > +++ /dev/null > @@ -1,66 +0,0 @@ > -#!/bin/sh > -# > -# arch/parisc/install.sh, derived from arch/i386/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 > -# > -# "make install" script for i386 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 [ -n "${INSTALLKERNEL}" ]; then > - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi > - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi > -fi > - > -# Default install > - > -if [ "$(basename $2)" = "vmlinuz" ]; 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 > - > diff --git a/scripts/install.sh b/scripts/install.sh > index 407ffa65062c..e0ffb95737d4 100644 > --- a/scripts/install.sh > +++ b/scripts/install.sh > @@ -53,6 +53,7 @@ base=$(basename "$2") > if [ "$base" = "bzImage" ] || > [ "$base" = "Image.gz" ] || > [ "$base" = "vmlinux.gz" ] || > + [ "$base" = "vmlinuz" ] || > [ "$base" = "zImage" ] ; then > # Compressed install > echo "Installing compressed kernel" > -- > 2.31.1 > -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 15/20] kbuild: parisc: use common install script 2021-04-07 11:23 ` Masahiro Yamada @ 2021-04-14 16:30 ` Helge Deller 2021-04-14 17:51 ` Greg Kroah-Hartman 0 siblings, 1 reply; 4+ messages in thread From: Helge Deller @ 2021-04-14 16:30 UTC (permalink / raw) To: Masahiro Yamada, Greg Kroah-Hartman Cc: Michal Marek, Linux Kbuild mailing list, linux-arch, Linux Kernel Mailing List, James E.J. Bottomley, linux-parisc On 4/7/21 1:23 PM, Masahiro Yamada wrote: > On Wed, Apr 7, 2021 at 2:34 PM Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: >> >> The common scripts/install.sh script will now work for parisc, all that >> is needed is to add the compressed image type to it. So add that file >> type check, and then we can remove the two different copies of the >> parisc install.sh script that were only different by one line and have >> the arch call the common install script. >> >> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> >> Cc: Helge Deller <deller@gmx.de> >> Cc: linux-parisc@vger.kernel.org >> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> --- >> arch/parisc/Makefile | 4 +-- >> arch/parisc/boot/Makefile | 2 +- >> arch/parisc/boot/install.sh | 65 ------------------------------------ >> arch/parisc/install.sh | 66 ------------------------------------- >> scripts/install.sh | 1 + >> 5 files changed, 4 insertions(+), 134 deletions(-) >> delete mode 100644 arch/parisc/boot/install.sh >> delete mode 100644 arch/parisc/install.sh >> >> diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile >> index 7d9f71aa829a..296d8ab8e2aa 100644 >> --- a/arch/parisc/Makefile >> +++ b/arch/parisc/Makefile >> @@ -164,10 +164,10 @@ vmlinuz: vmlinux >> endif >> >> install: >> - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ >> + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ >> $(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)" >> zinstall: >> - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ >> + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ >> $(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)" >> >> CLEAN_FILES += lifimage >> diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile >> index 61f44142cfe1..ad2611929aee 100644 >> --- a/arch/parisc/boot/Makefile >> +++ b/arch/parisc/boot/Makefile >> @@ -17,5 +17,5 @@ $(obj)/compressed/vmlinux: FORCE >> $(Q)$(MAKE) $(build)=$(obj)/compressed $@ >> >> install: $(CONFIGURE) $(obj)/bzImage >> - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ >> + sh -x $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \ >> System.map "$(INSTALL_PATH)" > > > > As far as I understood, there is no way to invoke this 'install' target > in arch/parisc/boot/Makefile since everything is done > by arch/parisc/Makefile. > > Can we remove this 'install' rule entirely? Yes, I think it can go in arch/parisc/boot/Makefile. Helge ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 15/20] kbuild: parisc: use common install script 2021-04-14 16:30 ` Helge Deller @ 2021-04-14 17:51 ` Greg Kroah-Hartman 0 siblings, 0 replies; 4+ messages in thread From: Greg Kroah-Hartman @ 2021-04-14 17:51 UTC (permalink / raw) To: Helge Deller Cc: Masahiro Yamada, Michal Marek, Linux Kbuild mailing list, linux-arch, Linux Kernel Mailing List, James E.J. Bottomley, linux-parisc On Wed, Apr 14, 2021 at 06:30:59PM +0200, Helge Deller wrote: > On 4/7/21 1:23 PM, Masahiro Yamada wrote: > > On Wed, Apr 7, 2021 at 2:34 PM Greg Kroah-Hartman > > <gregkh@linuxfoundation.org> wrote: > > > > > > The common scripts/install.sh script will now work for parisc, all that > > > is needed is to add the compressed image type to it. So add that file > > > type check, and then we can remove the two different copies of the > > > parisc install.sh script that were only different by one line and have > > > the arch call the common install script. > > > > > > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > > > Cc: Helge Deller <deller@gmx.de> > > > Cc: linux-parisc@vger.kernel.org > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > --- > > > arch/parisc/Makefile | 4 +-- > > > arch/parisc/boot/Makefile | 2 +- > > > arch/parisc/boot/install.sh | 65 ------------------------------------ > > > arch/parisc/install.sh | 66 ------------------------------------- > > > scripts/install.sh | 1 + > > > 5 files changed, 4 insertions(+), 134 deletions(-) > > > delete mode 100644 arch/parisc/boot/install.sh > > > delete mode 100644 arch/parisc/install.sh > > > > > > diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile > > > index 7d9f71aa829a..296d8ab8e2aa 100644 > > > --- a/arch/parisc/Makefile > > > +++ b/arch/parisc/Makefile > > > @@ -164,10 +164,10 @@ vmlinuz: vmlinux > > > endif > > > > > > install: > > > - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ > > > + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ > > > $(KERNELRELEASE) vmlinux System.map "$(INSTALL_PATH)" > > > zinstall: > > > - $(CONFIG_SHELL) $(srctree)/arch/parisc/install.sh \ > > > + $(CONFIG_SHELL) $(srctree)/scripts/install.sh \ > > > $(KERNELRELEASE) vmlinuz System.map "$(INSTALL_PATH)" > > > > > > CLEAN_FILES += lifimage > > > diff --git a/arch/parisc/boot/Makefile b/arch/parisc/boot/Makefile > > > index 61f44142cfe1..ad2611929aee 100644 > > > --- a/arch/parisc/boot/Makefile > > > +++ b/arch/parisc/boot/Makefile > > > @@ -17,5 +17,5 @@ $(obj)/compressed/vmlinux: FORCE > > > $(Q)$(MAKE) $(build)=$(obj)/compressed $@ > > > > > > install: $(CONFIGURE) $(obj)/bzImage > > > - sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ > > > + sh -x $(srctree)/scripts/install.sh $(KERNELRELEASE) $(obj)/bzImage \ > > > System.map "$(INSTALL_PATH)" > > > > > > > > As far as I understood, there is no way to invoke this 'install' target > > in arch/parisc/boot/Makefile since everything is done > > by arch/parisc/Makefile. > > > > Can we remove this 'install' rule entirely? > > Yes, I think it can go in arch/parisc/boot/Makefile. It's already there today, so I'll delete the rule from arch/parisc/Makefile in my next round. thanks, greg k-h ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-14 17:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210407053419.449796-1-gregkh@linuxfoundation.org>
2021-04-07 5:34 ` [PATCH 15/20] kbuild: parisc: use common install script 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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).