Revert OL modifications

This commit is contained in:
eabdullin 2025-07-04 09:47:19 +00:00
parent b7543d2648
commit 353fe2d392
2 changed files with 2 additions and 27 deletions

View File

@ -1,17 +0,0 @@
Orabug: 36562018
Hide Redhat reference in python-virt-firmware
Signed-off-by: Apoorva Eliza John <apoorva.eliza.john@oracle.com>
----------
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',

View File

@ -12,7 +12,7 @@
Name: python-virt-firmware
Version: %{pypi_version}
Release: %autorelease -e 0.1
Release: %autorelease
Summary: Tools for virtual machine firmware volumes
License: GPL-2.0-only
@ -21,10 +21,6 @@ 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)
@ -70,7 +66,7 @@ kernel-install plugin and systemd unit to manage automatic
UKI (unified kernel image) updates.
%prep
%autosetup -p1 -n virt_firmware-%{pypi_version}
%autosetup -n virt_firmware-%{pypi_version} -p1
%build
%py3_build
@ -128,13 +124,9 @@ install -m 755 systemd/99-uki-uefi-setup.install %{buildroot}%{_prefix}/lib/kern
%{_prefix}/lib/kernel/install.d/99-uki-uefi-setup.install
%changelog
* Wed Jul 02 2025 Craig Guiller <craig.guiller@oracle.com> - 24.11-2.0.1
- Hide redhat reference in python-virt-firmware [Orabug: 36562018]
## START: Generated by rpmautospec
* Wed Mar 26 2025 Gerd Hoffmann <kraxel@redhat.com> - 24.11-2
- backport bootctl fix for 99-uki-uefi-setup.install
- Resolves: RHEL-84983
* Fri Nov 29 2024 Gerd Hoffmann <kraxel@redhat.com> - 24.11-1
- update to version 24.11