update to 25.7

Resolves: RHEL-101805

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2025-07-03 19:42:21 +02:00
parent e96defc415
commit 9a82566d37
3 changed files with 3 additions and 36 deletions

View File

@ -1,32 +0,0 @@
From ca385db4f74a4d542455b9d40c91c8448c7be90c Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 20 Mar 2025 09:04:32 +0100
Subject: [PATCH] systemd: skip /boot/efi in case $BOOT_ROOT looks like the ESP
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
systemd/99-uki-uefi-setup.install | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/systemd/99-uki-uefi-setup.install b/systemd/99-uki-uefi-setup.install
index 26c8c018683b..773491198433 100755
--- a/systemd/99-uki-uefi-setup.install
+++ b/systemd/99-uki-uefi-setup.install
@@ -16,7 +16,13 @@ ENTRY_TOKEN="$KERNEL_INSTALL_ENTRY_TOKEN"
BOOT_ROOT="$KERNEL_INSTALL_BOOT_ROOT"
UKI_DIR_BOOT="$BOOT_ROOT/EFI/Linux"
-UKI_DIR_ESP="`bootctl -p`/EFI/Linux"
+if test -d "$BOOT_ROOT/EFI/BOOT"; then
+ # looks like $BOOT_ROOT points to the ESP
+ UKI_DIR_ESP="$UKI_DIR_BOOT"
+else
+ # must find ESP mount point
+ UKI_DIR_ESP="`bootctl -p`/EFI/Linux"
+fi
LOADER_INFO="$(kernel-bootcfg --print-loader)"
case "$LOADER_INFO" in
--
2.49.0

View File

@ -1,14 +1,13 @@
%global pypi_version 24.11
%global pypi_version 25.7
Name: python-virt-firmware
Version: %{pypi_version}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: Tools for virtual machine firmware volumes
License: GPLv2
URL: https://pypi.org/project/virt-firmware/
Source0: virt_firmware-%{pypi_version}.tar.gz
Patch1: 0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch
BuildArch: noarch
BuildRequires: python3-devel

View File

@ -1 +1 @@
SHA512 (virt_firmware-24.11.tar.gz) = 0c6b4d34d518835b4489404c784b263cd6ac8348834ba654d27ae3741d3d229ea5f6036870399390fa4fa33e01c8113d64faba0c6068e4b2fb5bbdd9429bf72f
SHA512 (virt_firmware-25.7.tar.gz) = 05ed004c09792603c7f5f26ad59707f20ee7982e7291d9eaea24168a6fde171ac5a64c943c7049349deeb97cd89fb121a6d24fe47b18f7bfa0227a07deb5b742