rpms/edk2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-07-22 02:59:08 -04:00
parent 448f2a2ea4
commit 55659a52d3
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
1000-replace-upstream-references.patch
View File

@ -1,23 +0,0 @@
From a194940b0fc62054430ca36b2bcec473a56745a1 Tue 30 Apr 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 30 Apr 2024 11:58:21 -0700
Subject: [PATCH] Replace upstream references
Orabug: 36569119
Signed-off-by: John McWalters <john.mcwalters@oracle.com>
Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
diff --git a/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c b/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c
index e978057..67d6957 100644
--- a/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c
+++ b/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c
@@ -311,7 +311,7 @@ int fipsinstall_main(int argc, char **argv)
EVP_MAC *mac = NULL;
CONF *conf = NULL;
- BIO_printf(bio_err, "This command is not enabled in the Red Hat Enterprise Linux OpenSSL build, please consult Red Hat documentation to learn how to enable FIPS mode\n");
+ BIO_printf(bio_err, "This command is not enabled in the Oracle Linux OpenSSL build, please consult Oracle Linux documentation to learn how to enable FIPS mode\n");
return 1;
if ((opts = sk_OPENSSL_STRING_new_null()) == NULL)

11
edk2.spec
View File

@ -25,7 +25,7 @@ ExclusiveArch: x86_64 aarch64 riscv64
Name: edk2
Version: %{GITDATE}
Release: 5.0.1%{?dist}.2
Release: 5%{?dist}.2
Summary: UEFI firmware for 64-bit virtual machines
License: BSD-2-Clause-Patent and Apache-2.0 and MIT
URL: http://www.tianocore.org
@ -62,9 +62,6 @@ Source50: 50-edk2-riscv-qcow2.json
Source80: edk2-build.py
Source82: edk2-build.rhel-10
#Oracle patch
Source1000: 1000-replace-upstream-references.patch
Source90: DBXUpdate-%{DBXDATE}.x64.bin
Source91: DBXUpdate-%{DBXDATE}.aa64.bin
Patch1: 0003-Remove-paths-leading-to-submodules.patch
@ -238,9 +235,6 @@ cp -a -- %{SOURCE90} %{SOURCE91} .
tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
tar -xf %{SOURCE3} --strip-components=1 --directory MdePkg/Library/BaseFdtLib/libfdt
#Apply Oracle patches
patch -p1 < %{SOURCE1000}
# Done by setup macro, but we do not use it for the auxiliary tarballs
chmod -Rf a+rX,u+w,g-w,o-w .
@ -511,9 +505,6 @@ install -m 0644 \
%changelog
* Wed Jul 15 2026 EL Errata <el-errata_ww@oracle.com> - 20251114-5.0.1.el10_2.2
- Replace upstream references [Orabug:36569119]
* Tue Jun 09 2026 Miroslav Rezanina <mrezanin@redhat.com> - 20251114-5.el10_2.2
- edk2-Revert-OvmfPkg-X86QemuLoadImageLib-flip-default-for-.patch [RHEL-182421]
- edk2-Bumped-to-OpenSSL-3.5.5-3.patch [RHEL-165699]