]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc: make the install target not depend on any build artifact
authorMasahiro Yamada <masahiroy@kernel.org>
Thu, 29 Jul 2021 14:19:36 +0000 (23:19 +0900)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 4 Aug 2021 00:53:38 +0000 (10:53 +1000)
The install target should not depend on any build artifact.

The reason is explained in commit fedda2eeb06b ("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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210729141937.445051-2-masahiroy@kernel.org
arch/powerpc/boot/Makefile
arch/powerpc/boot/install.sh

index a702f9d1ec0d767d843e4794fec9d90769826157..0d165bd98b6185426eb0949b220afec2f38add8a 100644 (file)
@@ -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
index 658c93ca7437483a9fe4a0b849d407757da7ea3d..14473150ddb4b173229702e48729f8b8117db636 100644 (file)
 # 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