diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2022-05-03 05:47:16 +0300 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-05-11 15:45:53 +0300 |
| commit | f774f5bb87d132b48bc4a99598c45f35121ac054 (patch) | |
| tree | 0a2dc74e70400523f9815d72a68d5264cbf2253a /arch/s390 | |
| parent | f18379a30271c0289c2d0e1074e1ed633bfd708c (diff) | |
| download | linux-f774f5bb87d132b48bc4a99598c45f35121ac054.tar.xz | |
kbuild: factor out the common installation code into scripts/install.sh
Many architectures have similar install.sh scripts.
The first half is really generic; it verifies that the kernel image
and System.map exist, then executes ~/bin/${INSTALLKERNEL} or
/sbin/${INSTALLKERNEL} if available.
The second half is kind of arch-specific; it copies the kernel image
and System.map to the destination, but the code is slightly different.
Factor out the generic part into scripts/install.sh.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Makefile | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/s390/boot/install.sh | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 7a65bca1e5af..cc2425539ef0 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -128,8 +128,7 @@ all: bzImage KBUILD_IMAGE := $(boot)/bzImage install: - sh -x $(srctree)/$(boot)/install.sh $(KERNELRELEASE) $(KBUILD_IMAGE) \ - System.map "$(INSTALL_PATH)" + $(call cmd,install) bzImage: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ diff --git a/arch/s390/boot/install.sh b/arch/s390/boot/install.sh index 515b27a996b3..616ba1660f08 100644..100755 --- a/arch/s390/boot/install.sh +++ b/arch/s390/boot/install.sh @@ -14,12 +14,6 @@ # $2 - kernel image file # $3 - kernel map file # $4 - default install path (blank if root directory) -# - -# 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 echo "Warning: '${INSTALLKERNEL}' command not available - additional " \ "bootloader config required" >&2 |