mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 01:51:18 +00:00
4b5f8a187f
commit7b21ed7d11upstream. If you select CONFIG_EFI_ZBOOT, we will generate vmlinuz.efi, and then when we go to install the kernel we'll install the vmlinux instead because install.sh only recognizes Image.gz as wanting the compressed install image. With CONFIG_EFI_ZBOOT we don't get the proper kernel installed, which means it doesn't boot, which makes for a very confused and subsequently angry kernel developer. Fix this by properly installing our compressed kernel if we've enabled CONFIG_EFI_ZBOOT. Signed-off-by: Josef Bacik <josef@toxicpanda.com> Cc: <stable@vger.kernel.org> # 6.1.x Fixes:c37b830fef("arm64: efi: enable generic EFI compressed boot") Reviewed-by: Simon Glass <sjg@chromium.org> Link: https://lore.kernel.org/r/6edb1402769c2c14c4fbef8f7eaedb3167558789.1702570674.git.josef@toxicpanda.com Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
40 lines
1,001 B
Bash
Executable file
40 lines
1,001 B
Bash
Executable file
#!/bin/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
|
|
# Adapted from code in arch/i386/boot/install.sh by Russell King
|
|
#
|
|
# "make install" script for the AArch64 Linux port
|
|
#
|
|
# Arguments:
|
|
# $1 - kernel version
|
|
# $2 - kernel image file
|
|
# $3 - kernel map file
|
|
# $4 - default install path (blank if root directory)
|
|
|
|
if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ]
|
|
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
|