From 296830a07b8432a4fd7ea75cdcd214ea0b5298c6 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:31:50 +0000 Subject: [PATCH] import CS python-virt-firmware-24.2-1.el9 --- .gitignore | 2 +- .python-virt-firmware.metadata | 2 +- SPECS/python-virt-firmware.spec | 70 +++++++++++++++++++++++++++++++-- 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a939529..749ce29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/virt-firmware-23.6.tar.gz +SOURCES/virt-firmware-24.2.tar.gz diff --git a/.python-virt-firmware.metadata b/.python-virt-firmware.metadata index 3d82782..204683d 100644 --- a/.python-virt-firmware.metadata +++ b/.python-virt-firmware.metadata @@ -1 +1 @@ -50f76b30a0238800fef1fda39e40fa040d4d2a2d SOURCES/virt-firmware-23.6.tar.gz +33632fc870a65b25373ee6c8003f25a2d7bd73aa SOURCES/virt-firmware-24.2.tar.gz diff --git a/SPECS/python-virt-firmware.spec b/SPECS/python-virt-firmware.spec index f6fe132..4d2ef60 100644 --- a/SPECS/python-virt-firmware.spec +++ b/SPECS/python-virt-firmware.spec @@ -1,8 +1,8 @@ -%global pypi_version 23.6 +%global pypi_version 24.2 Name: python-virt-firmware Version: %{pypi_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Tools for virtual machine firmware volumes License: GPLv2 @@ -14,6 +14,7 @@ BuildRequires: python3-devel BuildRequires: python3dist(cryptography) BuildRequires: python3dist(setuptools) BuildRequires: make +BuildRequires: systemd systemd-rpm-macros %description Tools for ovmf / armvirt firmware volumes This is a small collection of tools @@ -42,6 +43,16 @@ Requires: edk2-ovmf %description -n python3-virt-firmware-tests test cases +%package -n uki-direct +Provides: ukidirect +Summary: %{summary} - manage UKI kernels. +Requires: python3-virt-firmware +Conflicts: systemd < 252-21 +Obsoletes: rhel-cvm-update-tool +%description -n uki-direct +kernel-install plugin and systemd unit to manage automatic +UKI (unified kernel image) updates. + %prep %autosetup -n virt-firmware-%{pypi_version} @@ -56,10 +67,24 @@ install -m 644 man/*.1 %{buildroot}%{_mandir}/man1 # tests mkdir -p %{buildroot}%{_datadir}/%{name} cp -ar tests %{buildroot}%{_datadir}/%{name} +# uki-direct +install -m 755 -d %{buildroot}%{_unitdir} +install -m 755 -d %{buildroot}%{_libdir}/kernel/install.d +install -m 644 systemd/kernel-bootcfg-boot-successful.service %{buildroot}%{_unitdir} +install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_libdir}/kernel/install.d + +%post -n uki-direct +%systemd_post kernel-bootcfg-boot-successful.service + +%preun -n uki-direct +%systemd_preun kernel-bootcfg-boot-successful.service + +%postun -n uki-direct +%systemd_postun kernel-bootcfg-boot-successful.service %files -n python3-virt-firmware %license LICENSE -%doc README.md +%doc README.md experimental %{_bindir}/host-efi-vars %{_bindir}/virt-fw-dump %{_bindir}/virt-fw-vars @@ -70,7 +95,11 @@ cp -ar tests %{buildroot}%{_datadir}/%{name} %{_bindir}/pe-dumpinfo %{_bindir}/pe-listsigs %{_bindir}/pe-addsigs +%{_bindir}/pe-inspect %{_mandir}/man1/virt-*.1* +%{_mandir}/man1/kernel-bootcfg.1* +%{_mandir}/man1/uefi-boot-menu.1* +%{_mandir}/man1/pe-*.1* %{python3_sitelib}/virt/firmware %{python3_sitelib}/virt/peutils %{python3_sitelib}/virt_firmware-%{pypi_version}-py%{python3_version}.egg-info @@ -78,10 +107,45 @@ cp -ar tests %{buildroot}%{_datadir}/%{name} %files -n python3-virt-firmware-tests %{_datadir}/%{name}/tests +%files -n uki-direct +%{_unitdir}/kernel-bootcfg-boot-successful.service +%{_libdir}/kernel/install.d/99-uki-uefi-setup.install + %changelog +* Fri Feb 16 2024 Gerd Hoffmann - 24.2-1 +- update to version 24.2 + +* Thu Jan 11 2024 Gerd Hoffmann - 24.1.1-1 +- update to version 24.1.1 + +* Tue Jan 09 2024 Gerd Hoffmann - 24.1-1 +- update to version 24.1 +- Resolves: RHEL-21090 + +* Wed Jan 03 2024 Gerd Hoffmann - 23.11-3 +- add "obsoletes: rhel-cvm-update-tool" to uki-direct + +* Tue Jan 02 2024 Gerd Hoffmann - 23.11-2 +- add uki-direct subpackage +- Resolves: RHEL-19383 + +* Wed Dec 13 2023 Gerd Hoffmann - 23.11-1 +- update to version 23.11 + +* Thu Oct 12 2023 Gerd Hoffmann - 23.10-2 +- drop uki-direct subpackage for now (wait for systemd update) + +* Wed Oct 11 2023 Gerd Hoffmann - 23.10-1 +- update to version 23.10 +- add uki-direct subpackage + * Tue Jun 27 2023 Gerd Hoffmann - 23.6-2 - drop -peutils subpackage +* Tue Jun 20 2023 Gerd Hoffmann - 23.6-1 +- update to version 23.6 +- resolves: rhbz#2216102 + * Thu May 04 2023 Gerd Hoffmann - 23.5-1 - update to version 23.5 - resolves: rhbz#2193089