From b7543d264829f473a1a049f7a29ec67891cd84c7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 4 Jul 2025 08:47:18 +0000 Subject: [PATCH] import OL python-virt-firmware-24.11-2.0.1.el10_0 --- SOURCES/0001-Hide-Upstream-Reference.patch | 17 ++ ...t-efi-in-case-BOOT_ROOT-looks-like-t.patch | 32 ++++ SPECS/python-virt-firmware.spec | 162 ++++++++++++++---- 3 files changed, 175 insertions(+), 36 deletions(-) create mode 100644 SOURCES/0001-Hide-Upstream-Reference.patch create mode 100644 SOURCES/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch diff --git a/SOURCES/0001-Hide-Upstream-Reference.patch b/SOURCES/0001-Hide-Upstream-Reference.patch new file mode 100644 index 0000000..a348f2e --- /dev/null +++ b/SOURCES/0001-Hide-Upstream-Reference.patch @@ -0,0 +1,17 @@ +Orabug: 36562018 +Hide Redhat reference in python-virt-firmware + +Signed-off-by: Apoorva Eliza John +---------- +diff -ruN virt-firmware-24.2.orig/virt/firmware/vars.py virt-firmware-24.2/virt/firmware/vars.py +--- virt-firmware-24.2.orig/virt/firmware/vars.py 2024-04-29 11:04:50.124483969 +0000 ++++ virt-firmware-24.2/virt/firmware/vars.py 2024-04-29 11:06:34.136160920 +0000 +@@ -111,7 +111,7 @@ + pgroup = parser.add_argument_group('Secure boot convinience shortcuts') + pgroup.add_argument('--enroll-redhat', dest = 'redhat', + action = 'store_true', default = False, +- help = 'enroll default certificates for redhat platform') ++ help = argparse.SUPPRESS) + pgroup.add_argument('--enroll-cert', dest = 'enroll_cert', + help = 'enroll using specified certificate', metavar = "CERT") + pgroup.add_argument('--enroll-generate', dest = 'enroll_generate', diff --git a/SOURCES/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch b/SOURCES/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch new file mode 100644 index 0000000..fb94e54 --- /dev/null +++ b/SOURCES/0001-systemd-skip-boot-efi-in-case-BOOT_ROOT-looks-like-t.patch @@ -0,0 +1,32 @@ +From ca385db4f74a4d542455b9d40c91c8448c7be90c Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +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 +--- + 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 + diff --git a/SPECS/python-virt-firmware.spec b/SPECS/python-virt-firmware.spec index 5f15225..1e16c95 100644 --- a/SPECS/python-virt-firmware.spec +++ b/SPECS/python-virt-firmware.spec @@ -1,19 +1,34 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %global pypi_version 24.11 Name: python-virt-firmware Version: %{pypi_version} -Release: 1%{?dist} +Release: %autorelease -e 0.1 Summary: Tools for virtual machine firmware volumes -License: GPLv2 +License: GPL-2.0-only 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 +#OraclePatch +#Hide option --enroll-redhat +Patch1001: 0001-Hide-Upstream-Reference.patch + BuildRequires: python3-devel BuildRequires: python3dist(cryptography) BuildRequires: python3dist(setuptools) -BuildRequires: make +BuildRequires: make help2man BuildRequires: systemd systemd-rpm-macros %description @@ -26,6 +41,8 @@ to enroll secure boot certificates. Summary: %{summary} %{?python_provide:%python_provide python3-virt-firmware} Provides: virt-firmware +Conflicts: python3-virt-firmware-peutils < 23.9 +Obsoletes: python3-virt-firmware-peutils < 23.9 Requires: python3dist(cryptography) Requires: python3dist(setuptools) Requires: python3dist(pefile) @@ -47,14 +64,13 @@ test cases Provides: ukidirect Summary: %{summary} - manage UKI kernels. Requires: python3-virt-firmware -Conflicts: systemd < 252-21 -Obsoletes: rhel-cvm-update-tool +Conflicts: systemd < 254 %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} +%autosetup -p1 -n virt_firmware-%{pypi_version} %build %py3_build @@ -69,9 +85,9 @@ 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 755 -d %{buildroot}%{_prefix}/lib/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 +install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_prefix}/lib/kernel/install.d %post -n uki-direct %systemd_post kernel-bootcfg-boot-successful.service @@ -109,71 +125,143 @@ install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_libdir}/kernel/i %files -n uki-direct %{_unitdir}/kernel-bootcfg-boot-successful.service -%{_libdir}/kernel/install.d/99-uki-uefi-setup.install +%{_prefix}/lib/kernel/install.d/99-uki-uefi-setup.install %changelog +* Wed Jul 02 2025 Craig Guiller - 24.11-2.0.1 +- Hide redhat reference in python-virt-firmware [Orabug: 36562018] + +## START: Generated by rpmautospec +* Wed Mar 26 2025 Gerd Hoffmann - 24.11-2 +- backport bootctl fix for 99-uki-uefi-setup.install +- Resolves: RHEL-84983 + * Fri Nov 29 2024 Gerd Hoffmann - 24.11-1 - update to version 24.11 -- Resolves: RHEL-69507 + +* Tue Oct 29 2024 Troy Dawson - 24.7-2 +- Bump release for October 2024 mass rebuild: * Thu Jul 11 2024 Gerd Hoffmann - 24.7-1 - update to version 24.7 +* Thu Jul 11 2024 Gerd Hoffmann - 24.4-3 +- sync gating with rhel-9 + +* Mon Jun 24 2024 Troy Dawson - 24.4-2 +- Bump release for June 2024 mass rebuild + * Mon Apr 15 2024 Gerd Hoffmann - 24.4-1 - update to version 24.4 -* Fri Feb 16 2024 Gerd Hoffmann - 24.2-1 -- update to version 24.2 +* Fri Jan 26 2024 Fedora Release Engineering - 24.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Thu Jan 11 2024 Gerd Hoffmann - 24.1.1-1 +* Mon Jan 22 2024 Fedora Release Engineering - 24.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 10 2024 Gerd Hoffmann - 24.1.1-2 +- add pe test script + +* Wed Jan 10 2024 Gerd Hoffmann - 24.1.1-1 - update to version 24.1.1 +* Tue Jan 09 2024 Gerd Hoffmann - 24.1-2 +- add pe-inspect manpage to file list + * 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 +* Thu Nov 30 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) +* Tue Oct 10 2023 Gerd Hoffmann - 23.10-4 +- clarify uki-direct dependency on systemd >= 254 -* Wed Oct 11 2023 Gerd Hoffmann - 23.10-1 +* Tue Oct 10 2023 Gerd Hoffmann - 23.10-3 +- add pe-inspect to filelist + +* Tue Oct 10 2023 Gerd Hoffmann - 23.10-2 +- Revert "Add fixes for systemd unit + kernel-install plugin (from master + branch)." + +* Tue Oct 10 2023 Gerd Hoffmann - 23.10-1 - update to version 23.10 + +* Tue Sep 19 2023 Gerd Hoffmann - 23.9-6 +- Add fixes for systemd unit + kernel-install plugin (from master branch). + +* Tue Sep 19 2023 Gerd Hoffmann - 23.9-5 +- add Conflicts line for obsoleted subpackage + +* Tue Sep 19 2023 Gerd Hoffmann - 23.9-4 +- use %%_libdir + +* Mon Sep 18 2023 Gerd Hoffmann - 23.9-3 - add uki-direct subpackage -* Tue Jun 27 2023 Gerd Hoffmann - 23.6-2 +* Mon Sep 18 2023 Gerd Hoffmann - 23.9-2 - drop -peutils subpackage -* Tue Jun 20 2023 Gerd Hoffmann - 23.6-1 +* Mon Sep 18 2023 Gerd Hoffmann - 23.9-1 +- update to version 23.9 + +* Fri Sep 15 2023 Daniel P. Berrangé - 23.6-4 +- Convert to SPDX format + +* Fri Jul 21 2023 Fedora Release Engineering - 23.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 26 2023 Python Maint - 23.6-2 +- Rebuilt for Python 3.12 + +* Mon Jun 19 2023 Gerd Hoffmann - 23.6-1 - update to version 23.6 -- resolves: rhbz#2216102 + +* Wed Jun 14 2023 Python Maint - 23.5-2 +- Rebuilt for Python 3.12 * Thu May 04 2023 Gerd Hoffmann - 23.5-1 - update to version 23.5 -- resolves: rhbz#2193089 * Fri Apr 14 2023 Gerd Hoffmann - 23.4-1 - update to version 23.4 -- resolves: rhbz#2186770 -- resolves: rhbz#2143566 -* Tue Nov 15 2022 Gerd Hoffmann - 1.6-2 -- add tests.yml +* Fri Jan 20 2023 Fedora Release Engineering - 1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Mon Nov 14 2022 Gerd Hoffmann - 1.6-1 +* Mon Jan 16 2023 Gerd Hoffmann - 1.8-1 +- update to version 1.8 + +* Fri Dec 02 2022 Gerd Hoffmann - 1.7-1 +- update to version 1.7 + +* Thu Nov 10 2022 Gerd Hoffmann - 1.6-2 +- add conflict declaration + +* Thu Nov 10 2022 Gerd Hoffmann - 1.6-1 - update to version 1.6 -- drop peutils +- split peutils to subpackage + +* Wed Oct 05 2022 Gerd Hoffmann - 1.5-1 +- update to version 1.5 + +* Wed Oct 05 2022 Gerd Hoffmann - 1.4-5 +- turn on gating + +* Wed Oct 05 2022 Gerd Hoffmann - 1.4-4 +- more test dependency tweaks + +* Wed Oct 05 2022 Gerd Hoffmann - 1.4-3 +- tweak test dependencies + +* Wed Oct 05 2022 Gerd Hoffmann - 1.4-2 +- add tests + +* Tue Sep 27 2022 Gerd Hoffmann - 1.4-1 +- update to version 1.4 - add man-pages - add tests sub-package -- resolves: rhbz#2142608 * Fri Jul 22 2022 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -195,3 +283,5 @@ install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_libdir}/kernel/i * Mon Apr 11 2022 Gerd Hoffmann - 0.95-1 - Initial package. + +## END: Generated by rpmautospec