From: Nick Desaulniers <ndesaulniers@google.com> To: Masahiro Yamada <masahiroy@kernel.org> Cc: Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org, Nicholas Piggin <npiggin@gmail.com>, linux-kernel@vger.kernel.org, Jordan Niethe <jniethe5@gmail.com>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, Bill Wendling <morbo@google.com>, Joel Stanley <joel@jms.id.au> Subject: Re: [PATCH 2/3] powerpc: make the install target not depend on any build artifact Date: Fri, 30 Jul 2021 13:24:07 -0700 [thread overview] Message-ID: <CAKwvOd=dkr_GYEO3fdges+saA-7r0b2xWsuMQDex3FNQJgQNCw@mail.gmail.com> (raw) In-Reply-To: <20210729141937.445051-2-masahiroy@kernel.org> On Thu, Jul 29, 2021 at 7:22 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > The install target should not depend on any build artifact. > > The reason is explained in commit 19514fc665ff ("arm, kbuild: make > "make install" not depend on vmlinux"). > > Change the PowerPC installation code in a similar way. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > > arch/powerpc/boot/Makefile | 2 +- > arch/powerpc/boot/install.sh | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index a702f9d1ec0d..0d165bd98b61 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -445,7 +445,7 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) > $(Q)rm -f $@; ln $< $@ > > # Only install the vmlinux > -install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) > +install: > sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" > > PHONY += install > diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh > index 658c93ca7437..14473150ddb4 100644 > --- a/arch/powerpc/boot/install.sh > +++ b/arch/powerpc/boot/install.sh > @@ -20,6 +20,20 @@ > # Bail with error code if anything goes wrong > set -e > > +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 > -- > 2.27.0 > -- Thanks, ~Nick Desaulniers
WARNING: multiple messages have this Message-ID (diff)
From: Nick Desaulniers <ndesaulniers@google.com> To: Masahiro Yamada <masahiroy@kernel.org> Cc: linux-kernel@vger.kernel.org, Nicholas Piggin <npiggin@gmail.com>, "Gustavo A. R. Silva" <gustavoars@kernel.org>, Jordan Niethe <jniethe5@gmail.com>, Paul Mackerras <paulus@samba.org>, Bill Wendling <morbo@google.com>, linuxppc-dev@lists.ozlabs.org, Joel Stanley <joel@jms.id.au> Subject: Re: [PATCH 2/3] powerpc: make the install target not depend on any build artifact Date: Fri, 30 Jul 2021 13:24:07 -0700 [thread overview] Message-ID: <CAKwvOd=dkr_GYEO3fdges+saA-7r0b2xWsuMQDex3FNQJgQNCw@mail.gmail.com> (raw) In-Reply-To: <20210729141937.445051-2-masahiroy@kernel.org> On Thu, Jul 29, 2021 at 7:22 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > The install target should not depend on any build artifact. > > The reason is explained in commit 19514fc665ff ("arm, kbuild: make > "make install" not depend on vmlinux"). > > Change the PowerPC installation code in a similar way. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > > arch/powerpc/boot/Makefile | 2 +- > arch/powerpc/boot/install.sh | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index a702f9d1ec0d..0d165bd98b61 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -445,7 +445,7 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) > $(Q)rm -f $@; ln $< $@ > > # Only install the vmlinux > -install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) > +install: > sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" > > PHONY += install > diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh > index 658c93ca7437..14473150ddb4 100644 > --- a/arch/powerpc/boot/install.sh > +++ b/arch/powerpc/boot/install.sh > @@ -20,6 +20,20 @@ > # Bail with error code if anything goes wrong > set -e > > +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 > -- > 2.27.0 > -- Thanks, ~Nick Desaulniers
next prev parent reply other threads:[~2021-07-30 20:24 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-29 14:19 [PATCH 1/3] powerpc: remove unused zInstall target from arch/powerpc/boot/Makefile Masahiro Yamada 2021-07-29 14:19 ` Masahiro Yamada 2021-07-29 14:19 ` [PATCH 2/3] powerpc: make the install target not depend on any build artifact Masahiro Yamada 2021-07-29 14:19 ` Masahiro Yamada 2021-07-30 20:24 ` Nick Desaulniers [this message] 2021-07-30 20:24 ` Nick Desaulniers 2021-07-29 14:19 ` [PATCH 3/3] powerpc: move the install rule to arch/powerpc/Makefile Masahiro Yamada 2021-07-29 14:19 ` Masahiro Yamada 2021-07-30 20:29 ` Nick Desaulniers 2021-07-30 20:29 ` Nick Desaulniers 2021-08-18 13:58 ` Masahiro Yamada 2021-08-18 13:58 ` Masahiro Yamada 2021-07-30 20:20 ` [PATCH 1/3] powerpc: remove unused zInstall target from arch/powerpc/boot/Makefile Nick Desaulniers 2021-07-30 20:20 ` Nick Desaulniers 2021-08-18 13:38 ` Michael Ellerman 2021-08-18 13:38 ` Michael Ellerman
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='CAKwvOd=dkr_GYEO3fdges+saA-7r0b2xWsuMQDex3FNQJgQNCw@mail.gmail.com' \ --to=ndesaulniers@google.com \ --cc=benh@kernel.crashing.org \ --cc=gustavoars@kernel.org \ --cc=jniethe5@gmail.com \ --cc=joel@jms.id.au \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=masahiroy@kernel.org \ --cc=morbo@google.com \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=paulus@samba.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.