Import from AlmaLinux stable repository

This commit is contained in:
eabdullin 2025-12-04 12:46:03 +00:00
parent 66112e090a
commit 646c78f878
4 changed files with 4 additions and 37 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/virt_firmware-24.11.tar.gz
SOURCES/virt_firmware-25.7.3.tar.gz

View File

@ -1 +1 @@
07f06002c95710f77823908fcc32f2ae201f1610 SOURCES/virt_firmware-24.11.tar.gz
b7034c0e5d1d9e799f85089d89a35ec3208458a3 SOURCES/virt_firmware-25.7.3.tar.gz

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.3
Name: python-virt-firmware
Version: %{pypi_version}
Release: 1%{?dist}.1
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