On Thu, Jul 29, 2021 at 7:22 AM Masahiro Yamada <masahi...@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 <masahi...@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulni...@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
