Revert OL changes
This commit is contained in:
parent
93d3994249
commit
168cf039e5
@ -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)
|
|
@ -1,65 +0,0 @@
|
|||||||
From 126d004ce8884b68621394a62cf8a467c34d5d5b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
Date: Fri, 23 Aug 2024 14:36:16 +0200
|
|
||||||
Subject: [PATCH 2/3] OvmfPkg/QemuVideoDxe: ignore display resolutions smaller
|
|
||||||
than 640x480
|
|
||||||
|
|
||||||
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
RH-MergeRequest: 72: ignore display resolutions smaller than 640x480
|
|
||||||
RH-Jira: RHEL-56248
|
|
||||||
RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
|
|
||||||
RH-Commit: [2/2] 376e5213497c007cd88bd8f7df9980d28f0fd143 (kraxel.rh/centos-src-edk2)
|
|
||||||
|
|
||||||
GraphicsConsoleDxe will assert in case the resolution is too small.
|
|
||||||
|
|
||||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
(cherry picked from commit 391666da2c1dc5671bbb3393079d86f46e3435af)
|
|
||||||
---
|
|
||||||
OvmfPkg/QemuVideoDxe/Initialize.c | 18 ++++++++++++++----
|
|
||||||
1 file changed, 14 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c
|
|
||||||
index 050ae878ec..2d1f50637f 100644
|
|
||||||
--- a/OvmfPkg/QemuVideoDxe/Initialize.c
|
|
||||||
+++ b/OvmfPkg/QemuVideoDxe/Initialize.c
|
|
||||||
@@ -293,6 +293,8 @@ QemuVideoBochsEdid (
|
|
||||||
)
|
|
||||||
{
|
|
||||||
EFI_STATUS Status;
|
|
||||||
+ UINT32 X;
|
|
||||||
+ UINT32 Y;
|
|
||||||
|
|
||||||
if (Private->Variant != QEMU_VIDEO_BOCHS_MMIO) {
|
|
||||||
return;
|
|
||||||
@@ -344,16 +346,24 @@ QemuVideoBochsEdid (
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- *XRes = Private->Edid[56] | ((Private->Edid[58] & 0xf0) << 4);
|
|
||||||
- *YRes = Private->Edid[59] | ((Private->Edid[61] & 0xf0) << 4);
|
|
||||||
+ X = Private->Edid[56] | ((Private->Edid[58] & 0xf0) << 4);
|
|
||||||
+ Y = Private->Edid[59] | ((Private->Edid[61] & 0xf0) << 4);
|
|
||||||
DEBUG ((
|
|
||||||
DEBUG_INFO,
|
|
||||||
"%a: default resolution: %dx%d\n",
|
|
||||||
__func__,
|
|
||||||
- *XRes,
|
|
||||||
- *YRes
|
|
||||||
+ X,
|
|
||||||
+ Y
|
|
||||||
));
|
|
||||||
|
|
||||||
+ if ((X < 640) || (Y < 480)) {
|
|
||||||
+ /* ignore hint, GraphicsConsoleDxe needs 640x480 or larger */
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ *XRes = X;
|
|
||||||
+ *YRes = Y;
|
|
||||||
+
|
|
||||||
if (PcdGet8 (PcdVideoResolutionSource) == 0) {
|
|
||||||
Status = PcdSet32S (PcdVideoHorizontalResolution, *XRes);
|
|
||||||
ASSERT_RETURN_ERROR (Status);
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
|||||||
From f53820c753be836a79d5743d4181f6827e12bcdf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
Date: Fri, 23 Aug 2024 14:35:53 +0200
|
|
||||||
Subject: [PATCH 1/3] OvmfPkg/VirtioGpuDxe: ignore display resolutions smaller
|
|
||||||
than 640x480
|
|
||||||
|
|
||||||
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
RH-MergeRequest: 72: ignore display resolutions smaller than 640x480
|
|
||||||
RH-Jira: RHEL-56248
|
|
||||||
RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
|
|
||||||
RH-Commit: [1/2] 1d63fc76f46a6adb49e6c9447563d70ff9728b04 (kraxel.rh/centos-src-edk2)
|
|
||||||
|
|
||||||
GraphicsConsoleDxe will assert in case the resolution is too small.
|
|
||||||
|
|
||||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
(cherry picked from commit 58035e8b5e11cfe2b9e6428d14c7817b6b1c83a2)
|
|
||||||
---
|
|
||||||
OvmfPkg/VirtioGpuDxe/Gop.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/VirtioGpuDxe/Gop.c b/OvmfPkg/VirtioGpuDxe/Gop.c
|
|
||||||
index f64dfce5f4..d767114bbb 100644
|
|
||||||
--- a/OvmfPkg/VirtioGpuDxe/Gop.c
|
|
||||||
+++ b/OvmfPkg/VirtioGpuDxe/Gop.c
|
|
||||||
@@ -265,7 +265,8 @@ GopInitialize (
|
|
||||||
// query host for display resolution
|
|
||||||
//
|
|
||||||
GopNativeResolution (VgpuGop, &XRes, &YRes);
|
|
||||||
- if ((XRes == 0) || (YRes == 0)) {
|
|
||||||
+ if ((XRes < 640) || (YRes < 480)) {
|
|
||||||
+ /* ignore hint, GraphicsConsoleDxe needs 640x480 or larger */
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.3
|
|
||||||
|
|
@ -21,7 +21,7 @@ ExclusiveArch: x86_64 aarch64
|
|||||||
|
|
||||||
Name: edk2
|
Name: edk2
|
||||||
Version: %{GITDATE}
|
Version: %{GITDATE}
|
||||||
Release: 6.0.1%{?dist}.3
|
Release: 6%{?dist}.3
|
||||||
Summary: UEFI firmware for 64-bit virtual machines
|
Summary: UEFI firmware for 64-bit virtual machines
|
||||||
License: BSD-2-Clause-Patent and Apache-2.0 and MIT
|
License: BSD-2-Clause-Patent and Apache-2.0 and MIT
|
||||||
URL: http://www.tianocore.org
|
URL: http://www.tianocore.org
|
||||||
@ -50,9 +50,6 @@ Source45: 60-edk2-ovmf-x64-inteltdx.json
|
|||||||
Source80: edk2-build.py
|
Source80: edk2-build.py
|
||||||
Source82: edk2-build.rhel-9
|
Source82: edk2-build.rhel-9
|
||||||
|
|
||||||
#Oracle patch
|
|
||||||
Source1000: 1000-replace-upstream-references.patch
|
|
||||||
|
|
||||||
Source90: DBXUpdate-%{DBXDATE}.x64.bin
|
Source90: DBXUpdate-%{DBXDATE}.x64.bin
|
||||||
Patch1: 0003-Remove-paths-leading-to-submodules.patch
|
Patch1: 0003-Remove-paths-leading-to-submodules.patch
|
||||||
Patch2: 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
|
Patch2: 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
|
||||||
@ -104,18 +101,14 @@ Patch42: edk2-AmdSevDxe-Fix-the-shim-fallback-reboot-workaround-fo.patch
|
|||||||
Patch43: edk2-UefiCpuPkg-PiSmmCpuDxeSmm-skip-PatchInstructionX86-c.patch
|
Patch43: edk2-UefiCpuPkg-PiSmmCpuDxeSmm-skip-PatchInstructionX86-c.patch
|
||||||
# For RHEL-56974 - qemu-kvm: warning: Blocked re-entrant IO on MemoryRegion: acpi-cpu-hotplug at addr: 0x0 [rhel-9]
|
# For RHEL-56974 - qemu-kvm: warning: Blocked re-entrant IO on MemoryRegion: acpi-cpu-hotplug at addr: 0x0 [rhel-9]
|
||||||
Patch44: edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch
|
Patch44: edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch
|
||||||
# For RHEL-56248 - 507x510 display resolution should not crash the firmware [edk2,rhel-9.6]
|
|
||||||
Patch45: edk2-OvmfPkg-VirtioGpuDxe-ignore-display-resolutions-smal.patch
|
|
||||||
# For RHEL-56248 - 507x510 display resolution should not crash the firmware [edk2,rhel-9.6]
|
|
||||||
Patch46: edk2-OvmfPkg-QemuVideoDxe-ignore-display-resolutions-smal.patch
|
|
||||||
# For RHEL-60833 - CVE-2024-38796 edk2: Integer overflows in PeCoffLoaderRelocateImage [rhel-9.6]
|
# For RHEL-60833 - CVE-2024-38796 edk2: Integer overflows in PeCoffLoaderRelocateImage [rhel-9.6]
|
||||||
Patch47: edk2-MdePkg-Fix-overflow-issue-in-BasePeCoffLib.patch
|
Patch45: edk2-MdePkg-Fix-overflow-issue-in-BasePeCoffLib.patch
|
||||||
# For RHEL-65725 - [Regression] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.6]
|
# For RHEL-65725 - [Regression] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.6]
|
||||||
Patch48: edk2-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch
|
Patch46: edk2-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch
|
||||||
# For RHEL-66230 - [Regression] [aarch64] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.6]
|
# For RHEL-66230 - [Regression] [aarch64] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.6]
|
||||||
Patch49: edk2-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch
|
Patch47: edk2-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch
|
||||||
# For RHEL-58631 - [Regression] HTTP Boot fails to work with edk2-ovmf-20231122-6.el9_4.2 and greater
|
# For RHEL-58631 - [Regression] HTTP Boot fails to work with edk2-ovmf-20231122-6.el9_4.2 and greater
|
||||||
Patch50: edk2-OvmfPkg-Rerun-dispatcher-after-initializing-virtio-r.patch
|
Patch48: edk2-OvmfPkg-Rerun-dispatcher-after-initializing-virtio-r.patch
|
||||||
|
|
||||||
# python3-devel and libuuid-devel are required for building tools.
|
# python3-devel and libuuid-devel are required for building tools.
|
||||||
# python3-devel is also needed for varstore template generation and
|
# python3-devel is also needed for varstore template generation and
|
||||||
@ -226,9 +219,6 @@ cp -a -- %{SOURCE80} %{SOURCE82} .
|
|||||||
cp -a -- %{SOURCE90} .
|
cp -a -- %{SOURCE90} .
|
||||||
tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
|
tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
|
||||||
|
|
||||||
#Apply Oracle patches
|
|
||||||
patch -p1 < %{SOURCE1000}
|
|
||||||
|
|
||||||
# Done by %setup, but we do not use it for the auxiliary tarballs
|
# Done by %setup, but we do not use it for the auxiliary tarballs
|
||||||
chmod -Rf a+rX,u+w,g-w,o-w .
|
chmod -Rf a+rX,u+w,g-w,o-w .
|
||||||
|
|
||||||
@ -453,26 +443,21 @@ install -m 0644 \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Dec 19 2024 Alex Burmashev <alexander.burmashev@oracle.com> - 20240524-6.0.1.el9_5.3
|
* Fri Nov 22 2024 Jon Maloy <jmaloy@redhat.com> - 20240524-6.el9_5.3
|
||||||
- edk2-OvmfPkg-Rerun-dispatcher-after-initializing-virtio-r.patch [RHEL-58631]
|
- edk2-OvmfPkg-Rerun-dispatcher-after-initializing-virtio-r.patch [RHEL-63094]
|
||||||
- Resolves: RHEL-58631
|
- Resolves: RHEL-63094
|
||||||
([Regression] HTTP Boot fails to work with edk2-ovmf-20231122-6.el9_4.2 and greater)
|
([Regression] HTTP Boot fails to work with edk2-ovmf-20231122-6.el9_4.2 and greater [rhel-9.5])
|
||||||
- edk2-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch [RHEL-66230]
|
|
||||||
- Resolves: RHEL-66230
|
|
||||||
([Regression] [aarch64] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.6])
|
|
||||||
- edk2-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch [RHEL-65725]
|
|
||||||
- Resolves: RHEL-65725
|
|
||||||
([Regression] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.6])
|
|
||||||
- edk2-OvmfPkg-VirtioGpuDxe-ignore-display-resolutions-smal.patch [RHEL-56248]
|
|
||||||
- edk2-OvmfPkg-QemuVideoDxe-ignore-display-resolutions-smal.patch [RHEL-56248]
|
|
||||||
- edk2-MdePkg-Fix-overflow-issue-in-BasePeCoffLib.patch [RHEL-60833]
|
|
||||||
- Resolves: RHEL-56248
|
|
||||||
(507x510 display resolution should not crash the firmware [edk2,rhel-9.6])
|
|
||||||
- Resolves: RHEL-60833
|
|
||||||
(CVE-2024-38796 edk2: Integer overflows in PeCoffLoaderRelocateImage [rhel-9.6])
|
|
||||||
|
|
||||||
* Tue Nov 12 2024 EL Errata <el-errata_ww@oracle.com> - 20240524-6.0.1
|
* Mon Nov 11 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-6.el9_5.2
|
||||||
- Replace upstream references [Orabug:36569119]
|
- edk2-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch [RHEL-65735]
|
||||||
|
- edk2-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch [RHEL-65735]
|
||||||
|
- Resolves: RHEL-65735
|
||||||
|
([Regression] HTTP Boot not working on old vCPU without virtio-rng device present [rhel-9.5.z])
|
||||||
|
|
||||||
|
* Wed Oct 16 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-6.el9_5.1
|
||||||
|
- edk2-MdePkg-Fix-overflow-issue-in-BasePeCoffLib.patch [RHEL-60831]
|
||||||
|
- Resolves: RHEL-60831
|
||||||
|
(CVE-2024-38796 edk2: Integer overflows in PeCoffLoaderRelocateImage [rhel-9.5])
|
||||||
|
|
||||||
* Fri Sep 13 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-6
|
* Fri Sep 13 2024 Miroslav Rezanina <mrezanin@redhat.com> - 20240524-6
|
||||||
- edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch [RHEL-56974]
|
- edk2-OvmfPkg-CpuHotplugSmm-delay-SMM-exit.patch [RHEL-56974]
|
||||||
|
Loading…
Reference in New Issue
Block a user