Allow for xz'd symvers file

The Fedora/ARK kernel is moving to removing gzip as a dependency and
replacing it with xz.

Use xz instead of gz as an extension for the symvers file.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
(cherry picked from commit 78d64adfbe)
[rharwood: bump spec]
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Prarit Bhargava 2022-12-04 19:41:23 -05:00 committed by Robbie Harwood
parent 860cf94442
commit ff20c0ecb5
2 changed files with 13 additions and 1 deletions

View file

@ -75,6 +75,7 @@ case "$COMMAND" in
command -v restorecon &>/dev/null && \
restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
fi
# OLD method using gzip'd file (will be deprecated and removed in the future)
# symvers is symvers-<version>.gz symlink, needs a special treatment
i="$KERNEL_DIR/symvers.gz"
if [[ -e "$i" ]]; then
@ -83,6 +84,14 @@ case "$COMMAND" in
command -v restorecon &>/dev/null && \
restorecon "/boot/symvers-${KERNEL_VERSION}.gz"
fi
# symvers is symvers-<version>.bz symlink, needs a special treatment
i="$KERNEL_DIR/symvers.bz"
if [[ -e "$i" ]]; then
rm -f "/boot/symvers-${KERNEL_VERSION}.bz"
ln -s "$i" "/boot/symvers-${KERNEL_VERSION}.bz"
command -v restorecon &>/dev/null && \
restorecon "/boot/symvers-${KERNEL_VERSION}.bz"
fi
fi
if [[ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]] || [[ ! -f /sbin/new-kernel-pkg ]]; then

View file

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 59%{?dist}
Release: 60%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -531,6 +531,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Thu Jan 12 2023 Robbie Harwood <rharwood@redhat.com> - 2.06-60
- Alllow for xz'd symvers.gz file
* Wed Dec 21 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-59
- Fix prefix setting with memdisk creation for network boot