* Tue Jun 10 2025 Miroslav Rezanina <mrezanin@redhat.com> - 20250523-1
- Rebase to edk2-stable202505 [RHEL-82556] - Resolves: RHEL-82556 ([edk2,rhel-10] rebase to edk2-stable202505)
This commit is contained in:
parent
9ed01eda53
commit
97f880305e
@ -1,4 +1,4 @@
|
||||
From 4888fa38ba984aa41deb6b3160e155d4bd9bd4e6 Mon Sep 17 00:00:00 2001
|
||||
From 7e0fc3ba07d881b3cb91cdff2108182889161795 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Thu, 24 Mar 2022 03:23:02 -0400
|
||||
Subject: [PATCH] Remove paths leading to submodules
|
||||
@ -27,7 +27,7 @@ index 5275f657ef..39d7199753 100644
|
||||
EfiRom \
|
||||
GenFfs \
|
||||
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
||||
index b9bc7041f2..168f224d4b 100644
|
||||
index 3698caf902..5250d77ecc 100644
|
||||
--- a/MdeModulePkg/MdeModulePkg.dec
|
||||
+++ b/MdeModulePkg/MdeModulePkg.dec
|
||||
@@ -26,9 +26,6 @@
|
||||
@ -41,7 +41,7 @@ index b9bc7041f2..168f224d4b 100644
|
||||
## @libraryclass Defines a set of methods to reset whole system.
|
||||
ResetSystemLib|Include/Library/ResetSystemLib.h
|
||||
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
|
||||
index 37a2b461d4..a1686db8a5 100644
|
||||
index 6a6ef01311..523c784ede 100644
|
||||
--- a/MdePkg/MdePkg.dec
|
||||
+++ b/MdePkg/MdePkg.dec
|
||||
@@ -30,7 +30,6 @@
|
||||
|
@ -1,9 +1,14 @@
|
||||
From a10d90acbe8fde86ce8b22695efbd12f094beb6a Mon Sep 17 00:00:00 2001
|
||||
From c530c3ada9b21af6ceecd381a5688a615d48b8a4 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Tue, 25 Feb 2014 22:40:01 +0100
|
||||
Subject: [PATCH] MdeModulePkg: TerminalDxe: set xterm resolution on mode
|
||||
change (RH only)
|
||||
|
||||
Notes for rebase to edk2-stable202505:
|
||||
|
||||
- Minor context changes due to be03ceb ArmPkg: ArmFfaLib: Move ArmFfaLib
|
||||
implementation to MdeModulePkg
|
||||
|
||||
Notes for rebase to edk2-stable202311:
|
||||
|
||||
- Minor context changes due to new PCDs (for USB Networking) being added.
|
||||
@ -99,25 +104,25 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
3 files changed, 36 insertions(+)
|
||||
|
||||
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
||||
index 168f224d4b..5b6287341f 100644
|
||||
index 5250d77ecc..5a4808c267 100644
|
||||
--- a/MdeModulePkg/MdeModulePkg.dec
|
||||
+++ b/MdeModulePkg/MdeModulePkg.dec
|
||||
@@ -2275,6 +2275,10 @@
|
||||
# @Prompt The value is use for Usb Network rate limiting supported.
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdUsbNetworkRateLimitingFactor|100|UINT32|0x10000028
|
||||
@@ -2287,6 +2287,10 @@
|
||||
# @Prompt Conduit to use in ArmFfaLib.
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFfaLibConduitSmc|TRUE|BOOLEAN|0x10000029
|
||||
|
||||
+ ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal
|
||||
+ # mode change.
|
||||
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE|BOOLEAN|0x00010080
|
||||
+
|
||||
+ ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal
|
||||
+ # mode change.
|
||||
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE|BOOLEAN|0x00010080
|
||||
+
|
||||
[PcdsPatchableInModule]
|
||||
## Specify memory size with page number for PEI code when
|
||||
# Loading Module at Fixed Address feature is enabled.
|
||||
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||
index 7809869e7d..3be801039b 100644
|
||||
index eb8658c892..6d62cbf500 100644
|
||||
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||
@@ -7,6 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
@@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
**/
|
||||
|
||||
@ -126,7 +131,7 @@ index 7809869e7d..3be801039b 100644
|
||||
#include "Terminal.h"
|
||||
|
||||
//
|
||||
@@ -80,6 +82,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0
|
||||
@@ -82,6 +84,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0
|
||||
CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 };
|
||||
CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 };
|
||||
|
||||
@ -143,7 +148,7 @@ index 7809869e7d..3be801039b 100644
|
||||
//
|
||||
// Body of the ConOut functions
|
||||
//
|
||||
@@ -498,6 +510,24 @@ TerminalConOutSetMode (
|
||||
@@ -521,6 +533,24 @@ TerminalConOutSetMode (
|
||||
return EFI_DEVICE_ERROR;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 04f0bbedf4c2561a813b9d811790a2acb4fe15d9 Mon Sep 17 00:00:00 2001
|
||||
From 90952108059a48921f76f61fe1cda5eef258be01 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
||||
Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH
|
||||
@ -83,10 +83,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
9 files changed, 21 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index e0eaa3c574..b87d32682f 100644
|
||||
index e99fb3bd95..b28f014dcd 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -488,6 +488,7 @@
|
||||
@@ -489,6 +489,7 @@
|
||||
[PcdsDynamicDefault]
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -95,10 +95,10 @@ index e0eaa3c574..b87d32682f 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
|
||||
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
|
||||
index 1223e6f6a1..2ba701aded 100644
|
||||
index a4f6d1c10a..08a66f0d43 100644
|
||||
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
|
||||
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
|
||||
@@ -602,6 +602,7 @@
|
||||
@@ -603,6 +603,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -107,10 +107,10 @@ index 1223e6f6a1..2ba701aded 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
|
||||
index 6d3e0a5f1c..e7d8a4595c 100644
|
||||
index f1d070ca8c..a2201ec10b 100644
|
||||
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
|
||||
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
|
||||
@@ -479,6 +479,7 @@
|
||||
@@ -481,6 +481,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -119,10 +119,10 @@ index 6d3e0a5f1c..e7d8a4595c 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
|
||||
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
|
||||
index 84d587d069..9b7b7c6db1 100644
|
||||
index 8bd8b686b5..31c5ccda14 100644
|
||||
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
|
||||
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
|
||||
@@ -596,7 +596,7 @@
|
||||
@@ -588,7 +588,7 @@
|
||||
# only set when
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
@ -132,10 +132,10 @@ index 84d587d069..9b7b7c6db1 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 09c196feb3..afe26948c9 100644
|
||||
index fa73d355ea..cede7c2424 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -602,6 +602,7 @@
|
||||
@@ -594,6 +594,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -144,10 +144,10 @@ index 09c196feb3..afe26948c9 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index a9383a6b9b..0e545e8ae8 100644
|
||||
index 384bb310c3..89ed05431a 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -613,6 +613,7 @@
|
||||
@@ -605,6 +605,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -156,10 +156,10 @@ index a9383a6b9b..0e545e8ae8 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index eb5df0d74c..18c6b15f03 100644
|
||||
index 60fccc19d2..8f8711f519 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -635,6 +635,7 @@
|
||||
@@ -632,6 +632,7 @@
|
||||
# ($(SMM_REQUIRE) == FALSE)
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||
|
||||
@ -168,7 +168,7 @@ index eb5df0d74c..18c6b15f03 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
|
||||
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
||||
index 7b4ea1b827..54903cfca2 100644
|
||||
index a354e0641f..bb791fba71 100644
|
||||
--- a/OvmfPkg/PlatformPei/Platform.c
|
||||
+++ b/OvmfPkg/PlatformPei/Platform.c
|
||||
@@ -43,6 +43,18 @@
|
||||
@ -190,7 +190,7 @@ index 7b4ea1b827..54903cfca2 100644
|
||||
EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = {
|
||||
{
|
||||
EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
|
||||
@@ -357,6 +369,7 @@ InitializePlatform (
|
||||
@@ -365,6 +377,7 @@ InitializePlatform (
|
||||
MemTypeInfoInitialization (PlatformInfoHob);
|
||||
MemMapInitialization (PlatformInfoHob);
|
||||
NoexecDxeInitialization (PlatformInfoHob);
|
||||
@ -199,7 +199,7 @@ index 7b4ea1b827..54903cfca2 100644
|
||||
|
||||
InstallClearCacheCallback ();
|
||||
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||
index ddacdbd387..90c1086a1d 100644
|
||||
index 1b2af6f3e6..d01575528e 100644
|
||||
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||
@@ -107,6 +107,7 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f54df91aa966e052aef7ca50c308a830eac43a3d Mon Sep 17 00:00:00 2001
|
||||
From ab6f73488ed3975ded7f979fc6b89fd0f920b8ee Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Sun, 26 Jul 2015 08:02:50 +0000
|
||||
Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line
|
||||
@ -96,10 +96,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index 6193a4bb05..70ebb54ea5 100644
|
||||
index 7b26b5059e..da1f4040ab 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -306,6 +306,8 @@
|
||||
@@ -317,6 +317,8 @@
|
||||
gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
|
||||
!endif
|
||||
|
||||
@ -108,7 +108,7 @@ index 6193a4bb05..70ebb54ea5 100644
|
||||
[PcdsDynamicHii]
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS
|
||||
|
||||
@@ -415,7 +417,10 @@
|
||||
@@ -431,7 +433,10 @@
|
||||
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
|
||||
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
|
||||
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 00f560873afa5de151bba35ede85029c189abe2c Mon Sep 17 00:00:00 2001
|
||||
From d262d4f7794cdbf9fe2bba93cf0fcd67f4cb7995 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Tue, 21 Nov 2017 00:57:45 +0100
|
||||
Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE (RHEL only)
|
||||
@ -65,10 +65,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index b87d32682f..036fedafe6 100644
|
||||
index b28f014dcd..abe155e245 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -433,7 +433,7 @@
|
||||
@@ -434,7 +434,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
@ -78,10 +78,10 @@ index b87d32682f..036fedafe6 100644
|
||||
!if $(SOURCE_DEBUG_ENABLE) == TRUE
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index afe26948c9..d638465234 100644
|
||||
index cede7c2424..3300b55588 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -538,7 +538,7 @@
|
||||
@@ -530,7 +530,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
@ -91,10 +91,10 @@ index afe26948c9..d638465234 100644
|
||||
!if $(SOURCE_DEBUG_ENABLE) == TRUE
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 0e545e8ae8..3ecffba2f3 100644
|
||||
index 89ed05431a..38473ef3c2 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -544,7 +544,7 @@
|
||||
@@ -536,7 +536,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
@ -104,10 +104,10 @@ index 0e545e8ae8..3ecffba2f3 100644
|
||||
!if $(SOURCE_DEBUG_ENABLE) == TRUE
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 18c6b15f03..4f5df52d02 100644
|
||||
index 8f8711f519..676f984631 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -567,7 +567,7 @@
|
||||
@@ -564,7 +564,7 @@
|
||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||
# // significantly impact boot performance
|
||||
# DEBUG_ERROR 0x80000000 // Error
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 41b038723de806ff440e8fb2f722d5f2a9264ac3 Mon Sep 17 00:00:00 2001
|
||||
From c087bac4d8596a1712b16713d07f240b1f2d1bf9 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Tue, 21 Nov 2017 00:57:46 +0100
|
||||
Subject: [PATCH] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in
|
||||
@ -86,10 +86,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
4 files changed, 32 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index 036fedafe6..5e0aa4d2ac 100644
|
||||
index abe155e245..242ee35b80 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -692,8 +692,14 @@
|
||||
@@ -694,8 +694,14 @@
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
|
||||
@ -107,10 +107,10 @@ index 036fedafe6..5e0aa4d2ac 100644
|
||||
|
||||
#
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index d638465234..f3d425b866 100644
|
||||
index 3300b55588..308fea90a6 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -826,8 +826,14 @@
|
||||
@@ -819,8 +819,14 @@
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
|
||||
@ -128,10 +128,10 @@ index d638465234..f3d425b866 100644
|
||||
OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 3ecffba2f3..34a9c69a50 100644
|
||||
index 38473ef3c2..fcdebb2c0a 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -840,8 +840,14 @@
|
||||
@@ -833,8 +833,14 @@
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
|
||||
@ -149,10 +149,10 @@ index 3ecffba2f3..34a9c69a50 100644
|
||||
OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 4f5df52d02..fcb9610293 100644
|
||||
index 676f984631..c7cdd0b539 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -916,8 +916,14 @@
|
||||
@@ -914,8 +914,14 @@
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a9ed614256e94eaf29aa4117b3712fe35744e214 Mon Sep 17 00:00:00 2001
|
||||
From 21f45d5799cc6ce28177a92f6007542570e54fe7 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
||||
Subject: [PATCH] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in
|
||||
@ -61,10 +61,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index 70ebb54ea5..ae3656b9e6 100644
|
||||
index da1f4040ab..5f0fc7cdd0 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -556,7 +556,10 @@
|
||||
@@ -558,7 +558,10 @@
|
||||
#
|
||||
# Video support
|
||||
#
|
||||
@ -77,10 +77,10 @@ index 70ebb54ea5..ae3656b9e6 100644
|
||||
OvmfPkg/PlatformDxe/Platform.inf
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
index 61d2536123..786cb5c85f 100644
|
||||
index 49bd99346a..68400ac66c 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
@@ -466,7 +466,10 @@
|
||||
@@ -467,7 +467,10 @@
|
||||
#
|
||||
# Video support
|
||||
#
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 50962cb6584debac7b45957304ce6b276359acdc Mon Sep 17 00:00:00 2001
|
||||
From 039505f6002865c8a2cd5b7cf589c18264813140 Mon Sep 17 00:00:00 2001
|
||||
From: Philippe Mathieu-Daude <philmd@redhat.com>
|
||||
Date: Thu, 1 Aug 2019 20:43:48 +0200
|
||||
Subject: [PATCH] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d94174927d88d33e0dad75445179235554ef3fa3 Mon Sep 17 00:00:00 2001
|
||||
From c140b333c5b73104c6224b7adc540bd9d7a0bbeb Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Tue, 21 Nov 2017 00:57:47 +0100
|
||||
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe
|
||||
@ -63,10 +63,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
4 files changed, 16 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index 5e0aa4d2ac..d2a98268f8 100644
|
||||
index 242ee35b80..52bd587f1b 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -687,7 +687,10 @@
|
||||
@@ -689,7 +689,10 @@
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
@ -79,10 +79,10 @@ index 5e0aa4d2ac..d2a98268f8 100644
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index f3d425b866..b6e038af7b 100644
|
||||
index 308fea90a6..691d7fab14 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -821,7 +821,10 @@
|
||||
@@ -814,7 +814,10 @@
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
@ -95,10 +95,10 @@ index f3d425b866..b6e038af7b 100644
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 34a9c69a50..3f3a8b0077 100644
|
||||
index fcdebb2c0a..1f079baf7a 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -835,7 +835,10 @@
|
||||
@@ -828,7 +828,10 @@
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
@ -111,10 +111,10 @@ index 34a9c69a50..3f3a8b0077 100644
|
||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index fcb9610293..cf3cc1d40d 100644
|
||||
index c7cdd0b539..26f86230b4 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -911,7 +911,10 @@
|
||||
@@ -909,7 +909,10 @@
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f713b031e626ac22cf06f7afccfe204591283529 Mon Sep 17 00:00:00 2001
|
||||
From f910836bc0c2c10c4bd8bc8ff3ee028bcfc986f1 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 11:31:36 +0200
|
||||
Subject: [PATCH] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel"
|
||||
@ -32,7 +32,7 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
2 files changed, 18 insertions(+)
|
||||
|
||||
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
||||
index df6364cc31..42db89be42 100644
|
||||
index 646a9a5f15..98e2f1f74a 100644
|
||||
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
||||
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 21c93280857484a78048f27d02b7d77aba41a184 Mon Sep 17 00:00:00 2001
|
||||
From 956ea6ccb8bbf96e262d25c80d658ad024a3ad6a Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 11:40:09 +0200
|
||||
Subject: [PATCH] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 328772d42c66ae1135988488b79c0c1285479ff8 Mon Sep 17 00:00:00 2001
|
||||
From 1f39b58478c7a02bdd0b446a7bd417d55058b0d2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:28:49 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove EbcDxe (RHEL only)
|
||||
@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
8 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index d2a98268f8..cb2016a1bd 100644
|
||||
index 52bd587f1b..92a7b1b03d 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -613,7 +613,6 @@
|
||||
@@ -614,7 +614,6 @@
|
||||
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@ index d2a98268f8..cb2016a1bd 100644
|
||||
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||
OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
index 42178701fc..3dea9b36f8 100644
|
||||
index 46e20745fe..950705523a 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
@@ -212,7 +212,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
||||
@ -53,10 +53,10 @@ index 42178701fc..3dea9b36f8 100644
|
||||
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||
INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index b6e038af7b..3c8a493960 100644
|
||||
index 691d7fab14..9989e1144d 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -745,7 +745,6 @@
|
||||
@@ -737,7 +737,6 @@
|
||||
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
||||
}
|
||||
|
||||
@ -65,7 +65,7 @@ index b6e038af7b..3c8a493960 100644
|
||||
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||
OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
index bc7bb678b4..59d15bb77d 100644
|
||||
index d6abacc03b..58be8db2c8 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
@@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
||||
@ -77,10 +77,10 @@ index bc7bb678b4..59d15bb77d 100644
|
||||
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||
INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 3f3a8b0077..6268e0efc7 100644
|
||||
index 1f079baf7a..8e38b5d15d 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -758,7 +758,6 @@
|
||||
@@ -750,7 +750,6 @@
|
||||
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ index 3f3a8b0077..6268e0efc7 100644
|
||||
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||
OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
index 605d9cd47a..f4dee600f8 100644
|
||||
index 2ad26713f6..6b4d826df9 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
@@ -217,7 +217,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
||||
@ -101,10 +101,10 @@ index 605d9cd47a..f4dee600f8 100644
|
||||
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||
INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index cf3cc1d40d..acd0384e09 100644
|
||||
index 26f86230b4..c8eb31fa31 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -811,7 +811,6 @@
|
||||
@@ -808,7 +808,6 @@
|
||||
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
||||
}
|
||||
|
||||
@ -113,7 +113,7 @@ index cf3cc1d40d..acd0384e09 100644
|
||||
|
||||
UefiCpuPkg/CpuDxe/CpuDxe.inf {
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||
index 2602c3d2fe..5c382d8434 100644
|
||||
index 06ae0cafc1..3d28d7754d 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||
@@ -248,7 +248,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 52b865ae2deb2b3aeba06b2e714a4ff0ad88390f Mon Sep 17 00:00:00 2001
|
||||
From b3dc6cb66bc6fd53f73c7a1259a29a5f051a2d3e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:28:59 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove VirtioGpu device driver (RHEL only)
|
||||
@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
8 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index cb2016a1bd..7fb83c7d6d 100644
|
||||
index 92a7b1b03d..d0b80948b4 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -702,7 +702,6 @@
|
||||
@@ -704,7 +704,6 @@
|
||||
<PcdsFixedAtBuild>
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
||||
}
|
||||
@ -41,10 +41,10 @@ index cb2016a1bd..7fb83c7d6d 100644
|
||||
#
|
||||
# ISA Support
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
index 3dea9b36f8..899f02981f 100644
|
||||
index 950705523a..f0c2ae52e5 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
@@ -299,7 +299,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
@@ -300,7 +300,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
||||
|
||||
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
||||
@ -53,10 +53,10 @@ index 3dea9b36f8..899f02981f 100644
|
||||
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
||||
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 3c8a493960..04d4a8cdc6 100644
|
||||
index 9989e1144d..5130e411ca 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -836,7 +836,6 @@
|
||||
@@ -829,7 +829,6 @@
|
||||
<PcdsFixedAtBuild>
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
||||
}
|
||||
@ -65,10 +65,10 @@ index 3c8a493960..04d4a8cdc6 100644
|
||||
|
||||
#
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
index 59d15bb77d..7fd9203427 100644
|
||||
index 58be8db2c8..0e3fd507b0 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
@@ -316,7 +316,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
@@ -317,7 +317,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
|
||||
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
||||
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
||||
@ -77,10 +77,10 @@ index 59d15bb77d..7fd9203427 100644
|
||||
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
||||
INF OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 6268e0efc7..60d39ebe9f 100644
|
||||
index 8e38b5d15d..e8fe3945a8 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -850,7 +850,6 @@
|
||||
@@ -843,7 +843,6 @@
|
||||
<PcdsFixedAtBuild>
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
||||
}
|
||||
@ -89,10 +89,10 @@ index 6268e0efc7..60d39ebe9f 100644
|
||||
|
||||
#
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
index f4dee600f8..e6723f7c1c 100644
|
||||
index 6b4d826df9..4029025276 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
@@ -323,7 +323,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
@@ -324,7 +324,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
|
||||
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
||||
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
||||
@ -101,10 +101,10 @@ index f4dee600f8..e6723f7c1c 100644
|
||||
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
||||
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index acd0384e09..6653b7d6d0 100644
|
||||
index c8eb31fa31..f04cd47fdd 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -926,7 +926,6 @@
|
||||
@@ -924,7 +924,6 @@
|
||||
<PcdsFixedAtBuild>
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
||||
}
|
||||
@ -113,10 +113,10 @@ index acd0384e09..6653b7d6d0 100644
|
||||
|
||||
#
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||
index 5c382d8434..017113e198 100644
|
||||
index 3d28d7754d..f0c944b9be 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||
@@ -359,7 +359,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
@@ -360,7 +360,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||||
|
||||
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
||||
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0b30b50a00dd6227ca299adb9ab100cf8f1436a9 Mon Sep 17 00:00:00 2001
|
||||
From 379210ab23502c6934f21da21befd8a9757d192f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:13 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove VirtioFsDxe filesystem driver (RHEL only)
|
||||
@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
6 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 04d4a8cdc6..991802136e 100644
|
||||
index 5130e411ca..5997f26c80 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -814,7 +814,6 @@
|
||||
@@ -807,7 +807,6 @@
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -39,10 +39,10 @@ index 04d4a8cdc6..991802136e 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
index 7fd9203427..7e09e3aac9 100644
|
||||
index 0e3fd507b0..9c5c979456 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
@@ -289,7 +289,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
@@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -51,10 +51,10 @@ index 7fd9203427..7e09e3aac9 100644
|
||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index 60d39ebe9f..bdaf42eeb3 100644
|
||||
index e8fe3945a8..ffae791a12 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -828,7 +828,6 @@
|
||||
@@ -821,7 +821,6 @@
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -63,10 +63,10 @@ index 60d39ebe9f..bdaf42eeb3 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
index e6723f7c1c..4b8b0abf90 100644
|
||||
index 4029025276..5aa583ae22 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -75,10 +75,10 @@ index e6723f7c1c..4b8b0abf90 100644
|
||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index 6653b7d6d0..b10c3a38e3 100644
|
||||
index f04cd47fdd..c3da7ab913 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -904,7 +904,6 @@
|
||||
@@ -902,7 +902,6 @@
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -87,10 +87,10 @@ index 6653b7d6d0..b10c3a38e3 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||
index 017113e198..1f7fae766e 100644
|
||||
index f0c944b9be..a746d4807c 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||
@@ -325,7 +325,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
@@ -326,7 +326,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 218eb43cc26d2114663d4b99253e272428458add Mon Sep 17 00:00:00 2001
|
||||
From 92095eb018e9f93593121b51eadacb40b1f94218 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:16 +0200
|
||||
Subject: [PATCH] ArmVirtPkg: Remove VirtioFsDxe filesystem driver (RHEL only)
|
||||
@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
3 files changed, 3 deletions(-)
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index ae3656b9e6..152f521065 100644
|
||||
index 5f0fc7cdd0..2618699c00 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -470,7 +470,6 @@
|
||||
@@ -486,7 +486,6 @@
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -36,10 +36,10 @@ index ae3656b9e6..152f521065 100644
|
||||
#
|
||||
# Bds
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
index 622409af8a..f887be87f7 100644
|
||||
index e25d6bbe07..6b444be30c 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
@@ -85,7 +85,6 @@ READ_LOCK_STATUS = TRUE
|
||||
@@ -90,7 +90,6 @@ READ_LOCK_STATUS = TRUE
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
@ -48,10 +48,10 @@ index 622409af8a..f887be87f7 100644
|
||||
#
|
||||
# Status Code Routing
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
index 786cb5c85f..abbf21db23 100644
|
||||
index 68400ac66c..abfe5ed9b6 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
@@ -380,7 +380,6 @@
|
||||
@@ -395,7 +395,6 @@
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ace72ba9d5b2134703e82ab3a7bb3bf74f61ff3c Mon Sep 17 00:00:00 2001
|
||||
From ae5af20d14e1cb44b5a844cb569c7cc86a01c8c5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:19 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove UdfDxe filesystem driver (RHEL only)
|
||||
@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
8 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
index 7fb83c7d6d..2e1d366a7a 100644
|
||||
index d0b80948b4..c49949f991 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||
@@ -680,7 +680,6 @@
|
||||
@@ -682,7 +682,6 @@
|
||||
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -41,10 +41,10 @@ index 7fb83c7d6d..2e1d366a7a 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
index 899f02981f..2fe05eccdd 100644
|
||||
index f0c2ae52e5..45b97452b2 100644
|
||||
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||||
@@ -279,7 +279,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
@@ -280,7 +280,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -53,10 +53,10 @@ index 899f02981f..2fe05eccdd 100644
|
||||
INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
|
||||
INF OvmfPkg/AmdSev/Grub/Grub.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
index 991802136e..887d363c64 100644
|
||||
index 5997f26c80..5724461494 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||
@@ -813,7 +813,6 @@
|
||||
@@ -806,7 +806,6 @@
|
||||
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -65,10 +65,10 @@ index 991802136e..887d363c64 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
index 7e09e3aac9..30649699cd 100644
|
||||
index 9c5c979456..6159a58c62 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||
@@ -288,7 +288,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
@@ -289,7 +289,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -77,10 +77,10 @@ index 7e09e3aac9..30649699cd 100644
|
||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
index bdaf42eeb3..413ca4bb04 100644
|
||||
index ffae791a12..f2318ae8a4 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||
@@ -827,7 +827,6 @@
|
||||
@@ -820,7 +820,6 @@
|
||||
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -89,10 +89,10 @@ index bdaf42eeb3..413ca4bb04 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
index 4b8b0abf90..17da4a2e44 100644
|
||||
index 5aa583ae22..c6b056d84d 100644
|
||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||
@@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -101,10 +101,10 @@ index 4b8b0abf90..17da4a2e44 100644
|
||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||
index b10c3a38e3..5fe2deafb5 100644
|
||||
index c3da7ab913..b71a0ad76c 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||
@@ -903,7 +903,6 @@
|
||||
@@ -901,7 +901,6 @@
|
||||
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -113,10 +113,10 @@ index b10c3a38e3..5fe2deafb5 100644
|
||||
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
||||
MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
|
||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||
index 1f7fae766e..8b6cb74d2f 100644
|
||||
index a746d4807c..67d8003799 100644
|
||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||
@@ -324,7 +324,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
@@ -325,7 +325,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||||
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
||||
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3532b28dc643f91756bee70842a048515a880025 Mon Sep 17 00:00:00 2001
|
||||
From afe426e30067eb4c33f78d508662d0fe11fb81ed Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:22 +0200
|
||||
Subject: [PATCH] ArmVirtPkg: Remove UdfDxe filesystem driver (RHEL only)
|
||||
@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
3 files changed, 3 deletions(-)
|
||||
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
index 152f521065..3ce44a5b92 100644
|
||||
index 2618699c00..2c2480f369 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||
@@ -469,7 +469,6 @@
|
||||
@@ -485,7 +485,6 @@
|
||||
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
@ -36,10 +36,10 @@ index 152f521065..3ce44a5b92 100644
|
||||
#
|
||||
# Bds
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
index f887be87f7..8cf9eeac80 100644
|
||||
index 6b444be30c..e487e15eb1 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||
@@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE
|
||||
@@ -89,7 +89,6 @@ READ_LOCK_STATUS = TRUE
|
||||
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
|
||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
@ -48,10 +48,10 @@ index f887be87f7..8cf9eeac80 100644
|
||||
#
|
||||
# Status Code Routing
|
||||
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
index abbf21db23..df5191dfa1 100644
|
||||
index abfe5ed9b6..f1199ddb19 100644
|
||||
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||
@@ -379,7 +379,6 @@
|
||||
@@ -394,7 +394,6 @@
|
||||
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
|
||||
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||
FatPkg/EnhancedFatDxe/Fat.inf
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9bb526c6734a3e12214d41f5df6c25cc6d5a4748 Mon Sep 17 00:00:00 2001
|
||||
From fe71b5e20423c16f35abfbb0c2ac3c7b96136cc8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:25 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6dee47d7c716e46bb5ebb76b6fe01c4e32734aa1 Mon Sep 17 00:00:00 2001
|
||||
From 3b489c30495c4dd2da0b98925b2135d8bbfff382 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:31 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9a00e66d0b521dce76ec6ed7cf6f85398397d2f1 Mon Sep 17 00:00:00 2001
|
||||
From e4b6df7af85a0c96e0e1c383124cafad6bf45b7f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||||
Date: Thu, 1 Jul 2021 20:29:39 +0200
|
||||
Subject: [PATCH] OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a3280e4436b30d708c9db6f91bbb79597753a3a1 Mon Sep 17 00:00:00 2001
|
||||
From 61a6d756d7a88c79a033c386a0b2dd575d7a8b9f Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Steffen <osteffen@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 12:09:40 +0200
|
||||
Subject: [PATCH] OvmfPkg/AmdSevDxe: Shim Reboot workaround (RHEL only)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 65f164a78f5e00e501fb81a16d4fd5424a04b647 Mon Sep 17 00:00:00 2001
|
||||
From 312ead5fd6e27166a642cd4ea85b29a8ea4c3dd0 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Mon, 28 Aug 2023 13:11:02 +0200
|
||||
Subject: [PATCH] CryptoPkg/CrtLib: add stat.h include file (RH only)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 32133cbb04b88ba40ec5a6aa116c523ed17c676f Mon Sep 17 00:00:00 2001
|
||||
From 2ed4c608de4ef70c7c417eca540bc59edcb9fb71 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Mon, 28 Aug 2023 13:27:09 +0200
|
||||
Subject: [PATCH] CryptoPkg/CrtLib: add access/open/read/write/close syscalls
|
||||
@ -16,10 +16,10 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
2 files changed, 87 insertions(+)
|
||||
|
||||
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
|
||||
index b114cc069a..6ba751c1f1 100644
|
||||
index 8046ef9b20..aa0c967c53 100644
|
||||
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
|
||||
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
|
||||
@@ -589,6 +589,52 @@ fread (
|
||||
@@ -592,6 +592,52 @@ fread (
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e9ec9b6bbb5d575b1f6cf59968316fd736490c77 Mon Sep 17 00:00:00 2001
|
||||
From 86ef70c484b6d0cb96699c41ca23e8c54c6d7b9e Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Steffen <osteffen@redhat.com>
|
||||
Date: Wed, 14 Aug 2024 09:53:49 +0200
|
||||
Subject: [PATCH] NetworkPkg/DxeNetLib: Reword PseudoRandom error logging
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2b5830909dcfafb7db32a892a5aaead1ede9d694 Mon Sep 17 00:00:00 2001
|
||||
From 629f1f37f2a56fb185ccab39df1bed6c7743f315 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Steffen <osteffen@redhat.com>
|
||||
Date: Mon, 4 Nov 2024 12:40:12 +0100
|
||||
Subject: [PATCH] OvmfPkg: Add a Fallback RNG (RH only)
|
||||
@ -30,18 +30,18 @@ location_in_specfile: 48
|
||||
create mode 100644 OvmfPkg/Library/PlatformBootManagerLib/FallbackRng.h
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
|
||||
index e66693879d..9efdb1ce72 100644
|
||||
index b696f1b338..2982b4f288 100644
|
||||
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
|
||||
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <Library/XenPlatformLib.h>
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <Library/QemuFwCfgSimpleParserLib.h>
|
||||
#include <Library/PlatformBootManagerCommonLib.h>
|
||||
+#include "FallbackRng.h"
|
||||
|
||||
//
|
||||
// Global data
|
||||
@@ -590,6 +591,9 @@ PlatformBootManagerBeforeConsole (
|
||||
@@ -350,6 +351,9 @@ PlatformBootManagerBeforeConsole (
|
||||
ConnectVirtioPciRng,
|
||||
NULL
|
||||
);
|
||||
@ -51,7 +51,7 @@ index e66693879d..9efdb1ce72 100644
|
||||
}
|
||||
|
||||
EFI_STATUS
|
||||
@@ -1859,6 +1863,8 @@ PlatformBootManagerAfterConsole (
|
||||
@@ -1619,6 +1623,8 @@ PlatformBootManagerAfterConsole (
|
||||
|
||||
DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));
|
||||
|
||||
@ -315,7 +315,7 @@ index 0000000000..77332bc51c
|
||||
+
|
||||
+#endif
|
||||
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
||||
index 1a422ebb0e..3a70feb30e 100644
|
||||
index 8257862662..50a9ee94ad 100644
|
||||
--- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
||||
+++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
||||
@@ -25,6 +25,8 @@
|
||||
@ -327,15 +327,15 @@ index 1a422ebb0e..3a70feb30e 100644
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
@@ -57,6 +59,7 @@
|
||||
Tcg2PhysicalPresenceLib
|
||||
@@ -58,6 +60,7 @@
|
||||
XenPlatformLib
|
||||
QemuFwCfgSimpleParserLib
|
||||
PlatformBootManagerCommonLib
|
||||
+ RngLib
|
||||
|
||||
[Pcd]
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent
|
||||
@@ -81,6 +84,7 @@
|
||||
@@ -82,6 +85,7 @@
|
||||
gEfiDxeSmmReadyToLockProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
|
||||
gEfiLoadedImageProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
|
||||
gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
|
||||
@ -343,8 +343,8 @@ index 1a422ebb0e..3a70feb30e 100644
|
||||
|
||||
[Guids]
|
||||
gEfiEndOfDxeEventGroupGuid
|
||||
@@ -88,3 +92,4 @@
|
||||
gRootBridgesConnectedEventGroupGuid
|
||||
@@ -90,3 +94,4 @@
|
||||
gUefiShellFileGuid
|
||||
gGrubFileGuid
|
||||
gUiAppFileGuid
|
||||
+ gEfiRngAlgorithmRaw
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9acce167f815652329227e533e1979c664897bc2 Mon Sep 17 00:00:00 2001
|
||||
From 79fd7ddc704daf97929cb7f8ee62a6f89e1805c2 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Steffen <osteffen@redhat.com>
|
||||
Date: Thu, 7 Nov 2024 11:36:22 +0100
|
||||
Subject: [PATCH] OvmfPkg/ArmVirtPkg: Add a Fallback RNG (RH only)
|
||||
@ -29,18 +29,18 @@ location_in_specfile: 49
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
|
||||
index 8e93f3cfed..8aa1e8e2df 100644
|
||||
index 2c24c65489..273e6f6a7e 100644
|
||||
--- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
|
||||
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <Guid/GlobalVariable.h>
|
||||
#include <Guid/RootBridgesConnectedEventGroup.h>
|
||||
#include <Guid/SerialPortLibVendor.h>
|
||||
#include <Library/PlatformBootManagerCommonLib.h>
|
||||
+#include "FallbackRng.h"
|
||||
|
||||
#include "PlatformBm.h"
|
||||
|
||||
@@ -1029,6 +1030,7 @@ PlatformBootManagerBeforeConsole (
|
||||
@@ -819,6 +820,7 @@ PlatformBootManagerBeforeConsole (
|
||||
//
|
||||
FilterAndProcess (&gEfiGraphicsOutputProtocolGuid, NULL, AddOutput);
|
||||
|
||||
@ -48,7 +48,7 @@ index 8e93f3cfed..8aa1e8e2df 100644
|
||||
//
|
||||
// Add the hardcoded short-form USB keyboard device path to ConIn.
|
||||
//
|
||||
@@ -1110,6 +1112,8 @@ PlatformBootManagerBeforeConsole (
|
||||
@@ -916,6 +918,8 @@ PlatformBootManagerBeforeConsole (
|
||||
//
|
||||
FilterAndProcess (&gVirtioDeviceProtocolGuid, IsVirtioSerial, SetupVirtioSerial);
|
||||
FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciSerial, SetupVirtioSerial);
|
||||
@ -57,9 +57,9 @@ index 8e93f3cfed..8aa1e8e2df 100644
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1175,6 +1179,8 @@ PlatformBootManagerAfterConsole (
|
||||
RETURN_STATUS Status;
|
||||
@@ -982,6 +986,8 @@ PlatformBootManagerAfterConsole (
|
||||
BOOLEAN Uninstall;
|
||||
BOOLEAN ShellEnabled;
|
||||
|
||||
+ FallbackRngPrintWarning ();
|
||||
+
|
||||
@ -67,7 +67,7 @@ index 8e93f3cfed..8aa1e8e2df 100644
|
||||
// Show the splash screen.
|
||||
//
|
||||
diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
|
||||
index 8e7cd5605f..4583c05ef4 100644
|
||||
index 6c5552da16..1de19eb507 100644
|
||||
--- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
|
||||
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf
|
||||
@@ -27,6 +27,8 @@
|
||||
@ -79,23 +79,23 @@ index 8e7cd5605f..4583c05ef4 100644
|
||||
|
||||
[Packages]
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
@@ -53,6 +55,7 @@
|
||||
UefiBootServicesTableLib
|
||||
@@ -54,6 +56,7 @@
|
||||
UefiLib
|
||||
UefiRuntimeServicesTableLib
|
||||
PlatformBootManagerCommonLib
|
||||
+ RngLib
|
||||
|
||||
[FixedPcd]
|
||||
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
|
||||
@@ -70,6 +73,7 @@
|
||||
gEfiGlobalVariableGuid
|
||||
@@ -72,6 +75,7 @@
|
||||
gRootBridgesConnectedEventGroupGuid
|
||||
gUefiShellFileGuid
|
||||
gUiAppFileGuid
|
||||
+ gEfiRngAlgorithmRaw
|
||||
|
||||
[Protocols]
|
||||
gEfiFirmwareVolume2ProtocolGuid
|
||||
@@ -77,3 +81,4 @@
|
||||
@@ -79,3 +83,4 @@
|
||||
gEfiMemoryAttributeProtocolGuid
|
||||
gEfiPciRootBridgeIoProtocolGuid
|
||||
gVirtioDeviceProtocolGuid
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fce5a29e2fe628ff3be48634295de6f287dcab6d Mon Sep 17 00:00:00 2001
|
||||
From e3cffe314feb1f2e97c5f03e80a77c89582c3275 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 16 Jan 2025 17:20:38 +0100
|
||||
Subject: [PATCH] OvmfPkg/X64: add opt/org.tianocore/UninstallMemAttrProtocol
|
||||
@ -14,10 +14,10 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
2 files changed, 65 insertions(+)
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
|
||||
index 9efdb1ce72..1a55342f43 100644
|
||||
index 2982b4f288..b1722a28dd 100644
|
||||
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
|
||||
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
|
||||
@@ -1840,6 +1840,49 @@ SaveS3BootScript (
|
||||
@@ -1600,6 +1600,49 @@ SaveS3BootScript (
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
@ -67,7 +67,7 @@ index 9efdb1ce72..1a55342f43 100644
|
||||
/**
|
||||
Do the platform specific action after the console is ready
|
||||
|
||||
@@ -1860,6 +1903,7 @@ PlatformBootManagerAfterConsole (
|
||||
@@ -1620,6 +1663,7 @@ PlatformBootManagerAfterConsole (
|
||||
)
|
||||
{
|
||||
EFI_BOOT_MODE BootMode;
|
||||
@ -75,7 +75,7 @@ index 9efdb1ce72..1a55342f43 100644
|
||||
|
||||
DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));
|
||||
|
||||
@@ -1906,6 +1950,25 @@ PlatformBootManagerAfterConsole (
|
||||
@@ -1666,6 +1710,25 @@ PlatformBootManagerAfterConsole (
|
||||
//
|
||||
StoreQemuBootOrder ();
|
||||
|
||||
@ -102,10 +102,10 @@ index 9efdb1ce72..1a55342f43 100644
|
||||
// Process QEMU's -kernel command line option
|
||||
//
|
||||
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
||||
index 3a70feb30e..7f5cc256c7 100644
|
||||
index 50a9ee94ad..46989ff39d 100644
|
||||
--- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
||||
+++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
||||
@@ -66,6 +66,7 @@
|
||||
@@ -67,6 +67,7 @@
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdBootRestrictToFirmware
|
||||
@ -113,7 +113,7 @@ index 3a70feb30e..7f5cc256c7 100644
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable
|
||||
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
|
||||
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate ## CONSUMES
|
||||
@@ -85,6 +86,7 @@
|
||||
@@ -86,6 +87,7 @@
|
||||
gEfiLoadedImageProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
|
||||
gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
|
||||
gEfiRngProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
|
@ -1,41 +0,0 @@
|
||||
From 1e4acd524e41503e5b9baaa714f4210f00d67560 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 27 Feb 2025 10:59:32 +0100
|
||||
Subject: [PATCH] Revert "CryptoPkg/BaseCryptLib: add next parameter to
|
||||
SHA3_squeeze" (RH only)
|
||||
|
||||
This reverts commit 9895fe25ac9579cfd85327c7b6d8ee271539c0e5.
|
||||
|
||||
Revert adaptions for openssl newer than 3.0
|
||||
---
|
||||
CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h | 3 +--
|
||||
CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
|
||||
index c65bffa85d..03a1a58cb8 100644
|
||||
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
|
||||
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
|
||||
@@ -66,8 +66,7 @@ SHA3_squeeze (
|
||||
uint64_t A[5][5],
|
||||
unsigned char *out,
|
||||
size_t len,
|
||||
- size_t r,
|
||||
- int next
|
||||
+ size_t r
|
||||
);
|
||||
|
||||
/**
|
||||
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
|
||||
index f996778706..6abafc3c00 100644
|
||||
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
|
||||
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
|
||||
@@ -160,7 +160,7 @@ Sha3Final (
|
||||
|
||||
(void)SHA3_absorb (Context->A, Context->buf, BlockSize, BlockSize);
|
||||
|
||||
- SHA3_squeeze (Context->A, MessageDigest, Context->md_size, BlockSize, 0);
|
||||
+ SHA3_squeeze (Context->A, MessageDigest, Context->md_size, BlockSize);
|
||||
|
||||
return 1;
|
||||
}
|
32488
0030-CryptoPkg-openssl-update-generated-files.patch
Normal file
32488
0030-CryptoPkg-openssl-update-generated-files.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,25 +0,0 @@
|
||||
From 8453c26250a096d26cf2a91efdec1fed7e159435 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 27 Feb 2025 10:59:59 +0100
|
||||
Subject: [PATCH] Revert "CryptoPkg: add openssl/providers/fips/include to
|
||||
includes" (RH only)
|
||||
|
||||
This reverts commit a80136324956c012681c4fdfe9362f27697cb2e9.
|
||||
|
||||
Revert adaptions for openssl newer than 3.0
|
||||
---
|
||||
CryptoPkg/CryptoPkg.dec | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
|
||||
index 2cc57a0e92..dc521c09a8 100644
|
||||
--- a/CryptoPkg/CryptoPkg.dec
|
||||
+++ b/CryptoPkg/CryptoPkg.dec
|
||||
@@ -25,7 +25,6 @@
|
||||
Library/OpensslLib/openssl
|
||||
Library/OpensslLib/openssl/include
|
||||
Library/OpensslLib/openssl/providers/common/include
|
||||
- Library/OpensslLib/openssl/providers/fips/include
|
||||
Library/OpensslLib/openssl/providers/implementations/include
|
||||
Library/OpensslLib/OpensslGen/include
|
||||
Library/OpensslLib/OpensslGen/providers/common/include
|
@ -0,0 +1,32 @@
|
||||
From 74c49552c0e49e9f4193a042d4c3b543a5731717 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 24 Apr 2025 15:25:28 +0200
|
||||
Subject: [PATCH] CryptoPkg/openssl: add new generated files to uncrustify
|
||||
exception list
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
---
|
||||
CryptoPkg/CryptoPkg.ci.yaml | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/CryptoPkg/CryptoPkg.ci.yaml b/CryptoPkg/CryptoPkg.ci.yaml
|
||||
index 8bb5717a12..cf614f00fc 100644
|
||||
--- a/CryptoPkg/CryptoPkg.ci.yaml
|
||||
+++ b/CryptoPkg/CryptoPkg.ci.yaml
|
||||
@@ -142,12 +142,16 @@
|
||||
"Library/OpensslLib/OpensslGen/providers/common/der/der_digests_gen.c",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/der/der_ecx_gen.c",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/der/der_ec_gen.c",
|
||||
+ "Library/OpensslLib/OpensslGen/providers/common/der/der_ml_dsa_gen.c",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/der/der_rsa_gen.c",
|
||||
+ "Library/OpensslLib/OpensslGen/providers/common/der/der_slh_dsa_gen.c",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/der/der_wrap_gen.c",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_digests.h",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_ec.h",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_ecx.h",
|
||||
+ "Library/OpensslLib/OpensslGen/providers/common/include/prov/der_ml_dsa.h",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_rsa.h",
|
||||
+ "Library/OpensslLib/OpensslGen/providers/common/include/prov/der_slh_dsa.h",
|
||||
"Library/OpensslLib/OpensslGen/providers/common/include/prov/der_wrap.h",
|
||||
"Library/OpensslLib/OpensslStub/uefiprov.c"
|
||||
]
|
@ -1,68 +0,0 @@
|
||||
From f5ff6274e88027af48944e1128d24e1bd2068529 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 27 Feb 2025 11:00:07 +0100
|
||||
Subject: [PATCH] Revert "openssl: add more stubs for openssl 3.2.x" (RH only)
|
||||
|
||||
This reverts commit 005f4c6b5eeb325ed1fa1dee8d96172f2c017c77.
|
||||
|
||||
Revert adaptions for openssl newer than 3.0
|
||||
---
|
||||
.../OpensslLib/OpensslStub/SslExtServNull.c | 48 -------------------
|
||||
1 file changed, 48 deletions(-)
|
||||
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c b/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c
|
||||
index edd8d556a5..1e7136eee8 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c
|
||||
@@ -515,51 +515,3 @@ tls_construct_stoc_psk (
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
}
|
||||
-
|
||||
-EXT_RETURN
|
||||
-tls_construct_stoc_client_cert_type (
|
||||
- SSL_CONNECTION *sc,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
- )
|
||||
-{
|
||||
- return EXT_RETURN_FAIL;
|
||||
-}
|
||||
-
|
||||
-int
|
||||
-tls_parse_ctos_client_cert_type (
|
||||
- SSL_CONNECTION *sc,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
- )
|
||||
-{
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-EXT_RETURN
|
||||
-tls_construct_stoc_server_cert_type (
|
||||
- SSL_CONNECTION *sc,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
- )
|
||||
-{
|
||||
- return EXT_RETURN_FAIL;
|
||||
-}
|
||||
-
|
||||
-int
|
||||
-tls_parse_ctos_server_cert_type (
|
||||
- SSL_CONNECTION *sc,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
- )
|
||||
-{
|
||||
- return 0;
|
||||
-}
|
@ -0,0 +1,32 @@
|
||||
From ef3811a1c3f3c21d475d5c1fba15b21c495b4193 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Mon, 7 Apr 2025 19:22:04 +0200
|
||||
Subject: [PATCH] CryptoPkg/openssl: add ossl_bio_print_labeled_buf stub
|
||||
|
||||
New function in openssl 3.5 in a file edk2 replaces with stubs.
|
||||
Add a stub for the new function.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
---
|
||||
.../Library/OpensslLib/OpensslStub/EncoderNull.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslStub/EncoderNull.c b/CryptoPkg/Library/OpensslLib/OpensslStub/EncoderNull.c
|
||||
index f3106cf8ab..1430696462 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslStub/EncoderNull.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslStub/EncoderNull.c
|
||||
@@ -362,3 +362,14 @@ ossl_encoder_store_cache_flush (
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
+
|
||||
+int
|
||||
+ossl_bio_print_labeled_buf (
|
||||
+ BIO *out,
|
||||
+ const char *label,
|
||||
+ const unsigned char *buf,
|
||||
+ size_t buflen
|
||||
+ )
|
||||
+{
|
||||
+ return -1;
|
||||
+}
|
@ -1,959 +0,0 @@
|
||||
From 16643a5ad354bb91f8e8326676276643f3a7f0db Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 27 Feb 2025 11:00:15 +0100
|
||||
Subject: [PATCH] Revert "openssl: adapt stubs to openssl 3.2.x" (RH only)
|
||||
|
||||
This reverts commit 53cea8efd1c8697ba8293a6cfa4fc5508f8f3504.
|
||||
|
||||
Revert adaptions for openssl newer than 3.0
|
||||
---
|
||||
.../OpensslLib/OpensslStub/SslExtServNull.c | 374 +++++++++---------
|
||||
.../OpensslLib/OpensslStub/SslStatServNull.c | 115 +++---
|
||||
2 files changed, 245 insertions(+), 244 deletions(-)
|
||||
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c b/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c
|
||||
index 1e7136eee8..e3b3aa26ec 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslStub/SslExtServNull.c
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
int
|
||||
tls_parse_ctos_renegotiate (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return -1;
|
||||
@@ -25,11 +25,11 @@ tls_parse_ctos_renegotiate (
|
||||
|
||||
int
|
||||
tls_parse_ctos_server_name (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -37,11 +37,11 @@ tls_parse_ctos_server_name (
|
||||
|
||||
int
|
||||
tls_parse_ctos_maxfragmentlen (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -50,11 +50,11 @@ tls_parse_ctos_maxfragmentlen (
|
||||
#ifndef OPENSSL_NO_SRP
|
||||
int
|
||||
tls_parse_ctos_srp (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -64,11 +64,11 @@ tls_parse_ctos_srp (
|
||||
|
||||
int
|
||||
tls_parse_ctos_ec_pt_formats (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -76,11 +76,11 @@ tls_parse_ctos_ec_pt_formats (
|
||||
|
||||
int
|
||||
tls_parse_ctos_session_ticket (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -88,7 +88,7 @@ tls_parse_ctos_session_ticket (
|
||||
|
||||
int
|
||||
tls_parse_ctos_sig_algs_cert (
|
||||
- SSL_CONNECTION *s,
|
||||
+ SSL *s,
|
||||
PACKET *pkt,
|
||||
ossl_unused unsigned int context,
|
||||
ossl_unused X509 *x,
|
||||
@@ -100,11 +100,11 @@ tls_parse_ctos_sig_algs_cert (
|
||||
|
||||
int
|
||||
tls_parse_ctos_sig_algs (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -113,11 +113,11 @@ tls_parse_ctos_sig_algs (
|
||||
#ifndef OPENSSL_NO_OCSP
|
||||
int
|
||||
tls_parse_ctos_status_request (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -128,11 +128,11 @@ tls_parse_ctos_status_request (
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
int
|
||||
tls_parse_ctos_npn (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -146,11 +146,11 @@ tls_parse_ctos_npn (
|
||||
*/
|
||||
int
|
||||
tls_parse_ctos_alpn (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -159,11 +159,11 @@ tls_parse_ctos_alpn (
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
int
|
||||
tls_parse_ctos_use_srtp (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -173,11 +173,11 @@ tls_parse_ctos_use_srtp (
|
||||
|
||||
int
|
||||
tls_parse_ctos_etm (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -189,11 +189,11 @@ tls_parse_ctos_etm (
|
||||
*/
|
||||
int
|
||||
tls_parse_ctos_psk_kex_modes (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -205,11 +205,11 @@ tls_parse_ctos_psk_kex_modes (
|
||||
*/
|
||||
int
|
||||
tls_parse_ctos_key_share (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -217,11 +217,11 @@ tls_parse_ctos_key_share (
|
||||
|
||||
int
|
||||
tls_parse_ctos_cookie (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -229,11 +229,11 @@ tls_parse_ctos_cookie (
|
||||
|
||||
int
|
||||
tls_parse_ctos_supported_groups (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -241,11 +241,11 @@ tls_parse_ctos_supported_groups (
|
||||
|
||||
int
|
||||
tls_parse_ctos_ems (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -253,11 +253,11 @@ tls_parse_ctos_ems (
|
||||
|
||||
int
|
||||
tls_parse_ctos_early_data (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -265,11 +265,11 @@ tls_parse_ctos_early_data (
|
||||
|
||||
int
|
||||
tls_parse_ctos_psk (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -277,7 +277,7 @@ tls_parse_ctos_psk (
|
||||
|
||||
int
|
||||
tls_parse_ctos_post_handshake_auth (
|
||||
- SSL_CONNECTION *s,
|
||||
+ SSL *s,
|
||||
PACKET *pkt,
|
||||
ossl_unused unsigned int context,
|
||||
ossl_unused X509 *x,
|
||||
@@ -292,11 +292,11 @@ tls_parse_ctos_post_handshake_auth (
|
||||
*/
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_renegotiate (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -304,11 +304,11 @@ tls_construct_stoc_renegotiate (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_server_name (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -317,11 +317,11 @@ tls_construct_stoc_server_name (
|
||||
/* Add/include the server's max fragment len extension into ServerHello */
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_maxfragmentlen (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -329,11 +329,11 @@ tls_construct_stoc_maxfragmentlen (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_ec_pt_formats (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -341,11 +341,11 @@ tls_construct_stoc_ec_pt_formats (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_supported_groups (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -353,11 +353,11 @@ tls_construct_stoc_supported_groups (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_session_ticket (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -366,11 +366,11 @@ tls_construct_stoc_session_ticket (
|
||||
#ifndef OPENSSL_NO_OCSP
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_status_request (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -381,11 +381,11 @@ tls_construct_stoc_status_request (
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_next_proto_neg (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -395,11 +395,11 @@ tls_construct_stoc_next_proto_neg (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_alpn (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -408,11 +408,11 @@ tls_construct_stoc_alpn (
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_use_srtp (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -422,11 +422,11 @@ tls_construct_stoc_use_srtp (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_etm (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -434,11 +434,11 @@ tls_construct_stoc_etm (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_ems (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -446,11 +446,11 @@ tls_construct_stoc_ems (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_supported_versions (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -458,11 +458,11 @@ tls_construct_stoc_supported_versions (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_key_share (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -470,11 +470,11 @@ tls_construct_stoc_key_share (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_cookie (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -482,11 +482,11 @@ tls_construct_stoc_cookie (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_cryptopro_bug (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -494,11 +494,11 @@ tls_construct_stoc_cryptopro_bug (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_early_data (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
@@ -506,11 +506,11 @@ tls_construct_stoc_early_data (
|
||||
|
||||
EXT_RETURN
|
||||
tls_construct_stoc_psk (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt,
|
||||
- unsigned int context,
|
||||
- X509 *x,
|
||||
- size_t chainidx
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ unsigned int context,
|
||||
+ X509 *x,
|
||||
+ size_t chainidx
|
||||
)
|
||||
{
|
||||
return EXT_RETURN_FAIL;
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslStub/SslStatServNull.c b/CryptoPkg/Library/OpensslLib/OpensslStub/SslStatServNull.c
|
||||
index 82a95f50d5..878f9e1a0b 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslStub/SslStatServNull.c
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslStub/SslStatServNull.c
|
||||
@@ -15,8 +15,8 @@
|
||||
|
||||
int
|
||||
ossl_statem_server_read_transition (
|
||||
- SSL_CONNECTION *s,
|
||||
- int mt
|
||||
+ SSL *s,
|
||||
+ int mt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -31,7 +31,7 @@ ossl_statem_server_read_transition (
|
||||
*/
|
||||
int
|
||||
send_certificate_request (
|
||||
- SSL_CONNECTION *s
|
||||
+ SSL *s
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -43,7 +43,7 @@ send_certificate_request (
|
||||
*/
|
||||
WRITE_TRAN
|
||||
ossl_statem_server_write_transition (
|
||||
- SSL_CONNECTION *s
|
||||
+ SSL *s
|
||||
)
|
||||
{
|
||||
return WRITE_TRAN_ERROR;
|
||||
@@ -51,8 +51,8 @@ ossl_statem_server_write_transition (
|
||||
|
||||
WORK_STATE
|
||||
ossl_statem_server_pre_work (
|
||||
- SSL_CONNECTION *s,
|
||||
- WORK_STATE wst
|
||||
+ SSL *s,
|
||||
+ WORK_STATE wst
|
||||
)
|
||||
{
|
||||
return WORK_ERROR;
|
||||
@@ -64,8 +64,8 @@ ossl_statem_server_pre_work (
|
||||
*/
|
||||
WORK_STATE
|
||||
ossl_statem_server_post_work (
|
||||
- SSL_CONNECTION *s,
|
||||
- WORK_STATE wst
|
||||
+ SSL *s,
|
||||
+ WORK_STATE wst
|
||||
)
|
||||
{
|
||||
return WORK_ERROR;
|
||||
@@ -81,9 +81,10 @@ ossl_statem_server_post_work (
|
||||
*/
|
||||
int
|
||||
ossl_statem_server_construct_message (
|
||||
- SSL_CONNECTION *s,
|
||||
- confunc_f *confunc,
|
||||
- int *mt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt,
|
||||
+ confunc_f *confunc,
|
||||
+ int *mt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -95,7 +96,7 @@ ossl_statem_server_construct_message (
|
||||
*/
|
||||
size_t
|
||||
ossl_statem_server_max_message_size (
|
||||
- SSL_CONNECTION *s
|
||||
+ SSL *s
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -106,8 +107,8 @@ ossl_statem_server_max_message_size (
|
||||
*/
|
||||
MSG_PROCESS_RETURN
|
||||
ossl_statem_server_process_message (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt
|
||||
)
|
||||
{
|
||||
return MSG_PROCESS_ERROR;
|
||||
@@ -119,8 +120,8 @@ ossl_statem_server_process_message (
|
||||
*/
|
||||
WORK_STATE
|
||||
ossl_statem_server_post_process_message (
|
||||
- SSL_CONNECTION *s,
|
||||
- WORK_STATE wst
|
||||
+ SSL *s,
|
||||
+ WORK_STATE wst
|
||||
)
|
||||
{
|
||||
return WORK_ERROR;
|
||||
@@ -136,10 +137,10 @@ dtls_raw_hello_verify_request (
|
||||
return 0;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
dtls_construct_hello_verify_request (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -147,8 +148,8 @@ dtls_construct_hello_verify_request (
|
||||
|
||||
MSG_PROCESS_RETURN
|
||||
tls_process_client_hello (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt
|
||||
)
|
||||
{
|
||||
return MSG_PROCESS_ERROR;
|
||||
@@ -160,7 +161,7 @@ tls_process_client_hello (
|
||||
*/
|
||||
int
|
||||
tls_handle_alpn (
|
||||
- SSL_CONNECTION *s
|
||||
+ SSL *s
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -168,44 +169,44 @@ tls_handle_alpn (
|
||||
|
||||
WORK_STATE
|
||||
tls_post_process_client_hello (
|
||||
- SSL_CONNECTION *s,
|
||||
- WORK_STATE wst
|
||||
+ SSL *s,
|
||||
+ WORK_STATE wst
|
||||
)
|
||||
{
|
||||
return WORK_ERROR;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_server_hello (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_server_done (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_server_key_exchange (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_certificate_request (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -213,8 +214,8 @@ tls_construct_certificate_request (
|
||||
|
||||
MSG_PROCESS_RETURN
|
||||
tls_process_client_key_exchange (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt
|
||||
)
|
||||
{
|
||||
return MSG_PROCESS_ERROR;
|
||||
@@ -222,8 +223,8 @@ tls_process_client_key_exchange (
|
||||
|
||||
WORK_STATE
|
||||
tls_post_process_client_key_exchange (
|
||||
- SSL_CONNECTION *s,
|
||||
- WORK_STATE wst
|
||||
+ SSL *s,
|
||||
+ WORK_STATE wst
|
||||
)
|
||||
{
|
||||
return WORK_ERROR;
|
||||
@@ -231,26 +232,26 @@ tls_post_process_client_key_exchange (
|
||||
|
||||
MSG_PROCESS_RETURN
|
||||
tls_process_client_certificate (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt
|
||||
)
|
||||
{
|
||||
return MSG_PROCESS_ERROR;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_server_certificate (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_new_session_ticket (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -262,17 +263,17 @@ tls_construct_new_session_ticket (
|
||||
*/
|
||||
int
|
||||
tls_construct_cert_status_body (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
-CON_FUNC_RETURN
|
||||
+int
|
||||
tls_construct_cert_status (
|
||||
- SSL_CONNECTION *s,
|
||||
- WPACKET *pkt
|
||||
+ SSL *s,
|
||||
+ WPACKET *pkt
|
||||
)
|
||||
{
|
||||
return 0;
|
||||
@@ -286,8 +287,8 @@ tls_construct_cert_status (
|
||||
*/
|
||||
MSG_PROCESS_RETURN
|
||||
tls_process_next_proto (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt
|
||||
)
|
||||
{
|
||||
return MSG_PROCESS_ERROR;
|
||||
@@ -297,8 +298,8 @@ tls_process_next_proto (
|
||||
|
||||
MSG_PROCESS_RETURN
|
||||
tls_process_end_of_early_data (
|
||||
- SSL_CONNECTION *s,
|
||||
- PACKET *pkt
|
||||
+ SSL *s,
|
||||
+ PACKET *pkt
|
||||
)
|
||||
{
|
||||
return MSG_PROCESS_ERROR;
|
60
0033-CryptoPkg-CrtLib-add-strpbrk-implementation.patch
Normal file
60
0033-CryptoPkg-CrtLib-add-strpbrk-implementation.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From 259acb5ec295d0f498ea035eaff5acd39ce71144 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 24 Apr 2025 12:06:05 +0200
|
||||
Subject: [PATCH] CryptoPkg/CrtLib: add strpbrk implementation
|
||||
|
||||
Needed by openssl-3.5.1.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
---
|
||||
.../Library/BaseCryptLib/SysCall/CrtWrapper.c | 19 +++++++++++++++++++
|
||||
CryptoPkg/Library/Include/CrtLibSupport.h | 6 ++++++
|
||||
2 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
|
||||
index aa0c967c53..11d01106d4 100644
|
||||
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
|
||||
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
|
||||
@@ -425,6 +425,25 @@ strtoul (
|
||||
return 0;
|
||||
}
|
||||
|
||||
+char *
|
||||
+strpbrk (
|
||||
+ const char *s,
|
||||
+ const char *accept
|
||||
+ )
|
||||
+{
|
||||
+ int i;
|
||||
+
|
||||
+ for ( ; *s != '\0'; s++) {
|
||||
+ for (i = 0; accept[i] != '\0'; i++) {
|
||||
+ if (*s == accept[i]) {
|
||||
+ return (char *)s;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
/* Convert character to lowercase */
|
||||
int
|
||||
tolower (
|
||||
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
|
||||
index 8663554960..21780780f0 100644
|
||||
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
|
||||
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
|
||||
@@ -467,6 +467,12 @@ strcat (
|
||||
const char *strSource
|
||||
);
|
||||
|
||||
+char *
|
||||
+strpbrk (
|
||||
+ const char *s,
|
||||
+ const char *accept
|
||||
+ );
|
||||
+
|
||||
//
|
||||
// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
|
||||
//
|
@ -0,0 +1,28 @@
|
||||
From debbe77a3d56fc11bc52c8054656ed5139d72691 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 24 Apr 2025 17:21:04 +0200
|
||||
Subject: [PATCH] CryptoPkg/CrtLib: explicitly define INT32* constants
|
||||
|
||||
Avoids openssl-3.5 trying to figure automatically with some macro
|
||||
magic, which happens to not work with the microsoft compiler.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
---
|
||||
CryptoPkg/Library/Include/CrtLibSupport.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
|
||||
index 21780780f0..f344691d0d 100644
|
||||
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
|
||||
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
|
||||
@@ -80,6 +80,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
#define CHAR_BIT 8 /* Number of bits in a char */
|
||||
#define SIZE_MAX 0xFFFFFFFF /* Maximum unsigned size_t */
|
||||
|
||||
+#define INT32_MIN INT_MIN
|
||||
+#define INT32_MAX INT_MAX
|
||||
+#define UINT32_MAX UINT_MAX
|
||||
+
|
||||
//
|
||||
// Address families.
|
||||
//
|
@ -1,27 +0,0 @@
|
||||
From 9f8d5d1a62c234628e34bf1c1e8d7fd0da30dad9 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Fri, 7 Mar 2025 12:13:28 +0100
|
||||
Subject: [PATCH] OvmfPkg/PlatformInitLib: fix typo
|
||||
|
||||
There is a typo in the FwCfg file name, it's spelled
|
||||
'tianocore' not 'tianocode'. Fix it.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
(cherry picked from commit 6234d09f7582e7f759ca93c9af1583b01cb5954d)
|
||||
---
|
||||
OvmfPkg/Library/PlatformInitLib/MemDetect.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
|
||||
index b6aefb321d..1f987f2efd 100644
|
||||
--- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c
|
||||
+++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
|
||||
@@ -994,7 +994,7 @@ PlatformSetupPagingLevel (
|
||||
}
|
||||
|
||||
Status = QemuFwCfgParseUint32 (
|
||||
- "opt/org.tianocode/PagingLevel",
|
||||
+ "opt/org.tianocore/PagingLevel",
|
||||
FALSE,
|
||||
&PagingLevel
|
||||
);
|
@ -0,0 +1,92 @@
|
||||
From 6daa865f2500da449983353418aedab65322740d Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Fri, 25 Apr 2025 07:28:41 +0200
|
||||
Subject: [PATCH] CryptoPkg/openssl: turn off warning 4130 for microsoft
|
||||
compiler
|
||||
|
||||
Needed to build with openssl-3.5.
|
||||
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
---
|
||||
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 4 ++--
|
||||
CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf | 4 ++--
|
||||
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 4 ++--
|
||||
CryptoPkg/Library/OpensslLib/OpensslLibFull.inf | 4 ++--
|
||||
CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 4 ++--
|
||||
5 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
index 1e1b732b3e..9c5d501bb7 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
@@ -772,8 +772,8 @@
|
||||
# C4819: The file contains a character that cannot be represented in the current code page
|
||||
# C4133: incompatible types - from 'ASN1_TYPE *' to 'const ASN1_STRING *' (v3_genn.c(101))
|
||||
#
|
||||
- MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
+ MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
+ MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
|
||||
#
|
||||
# Disable following Visual Studio 2015 compiler warnings brought by openssl source,
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
|
||||
index 94eebf8dfd..25456e15c4 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
|
||||
@@ -2254,8 +2254,8 @@
|
||||
# C4819: The file contains a character that cannot be represented in the current code page
|
||||
# C4133: incompatible types - from 'ASN1_TYPE *' to 'const ASN1_STRING *' (v3_genn.c(101))
|
||||
#
|
||||
- MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_IA32) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_X64) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
+ MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_IA32) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
+ MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_X64) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
|
||||
#
|
||||
# Disable following Visual Studio 2015 compiler warnings brought by openssl source,
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||||
index 122b359c02..0946e877ae 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||||
@@ -722,8 +722,8 @@
|
||||
# C4819: The file contains a character that cannot be represented in the current code page
|
||||
# C4133: incompatible types - from 'ASN1_TYPE *' to 'const ASN1_STRING *' (v3_genn.c(101))
|
||||
#
|
||||
- MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
+ MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
+ MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
|
||||
#
|
||||
# Disable following Visual Studio 2015 compiler warnings brought by openssl source,
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
|
||||
index c1823fe406..fbeb22f5b3 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
|
||||
@@ -831,8 +831,8 @@
|
||||
# C4819: The file contains a character that cannot be represented in the current code page
|
||||
# C4133: incompatible types - from 'ASN1_TYPE *' to 'const ASN1_STRING *' (v3_genn.c(101))
|
||||
#
|
||||
- MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
+ MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
+ MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
|
||||
#
|
||||
# Disable following Visual Studio 2015 compiler warnings brought by openssl source,
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
|
||||
index 64270b816e..b49888ccb2 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
|
||||
@@ -2421,8 +2421,8 @@
|
||||
# C4819: The file contains a character that cannot be represented in the current code page
|
||||
# C4133: incompatible types - from 'ASN1_TYPE *' to 'const ASN1_STRING *' (v3_genn.c(101))
|
||||
#
|
||||
- MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_IA32) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_X64) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4133 /wd4189
|
||||
+ MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_IA32) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
+ MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_X64) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 /wd4130 /wd4133 /wd4189
|
||||
|
||||
#
|
||||
# Disable following Visual Studio 2015 compiler warnings brought by openssl source,
|
43
0036-Add-Wno-unused-variable-to-OpensslLibFull-RH-only.patch
Normal file
43
0036-Add-Wno-unused-variable-to-OpensslLibFull-RH-only.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From cf6bc5b5d84e61f1fad76edab1891a8fe28f1864 Mon Sep 17 00:00:00 2001
|
||||
From: Luigi Leonardi <leonardi@redhat.com>
|
||||
Date: Thu, 29 May 2025 16:59:00 +0200
|
||||
Subject: [PATCH] Add Wno-unused-variable to OpensslLibFull (RH only)
|
||||
|
||||
RHEL OpenSSL has an unused variable, this stops the compilation.
|
||||
Prevent the compiler from stopping when dealing with this issue.
|
||||
|
||||
Signed-off-by: Luigi Leonardi <leonardi@redhat.com>
|
||||
---
|
||||
.../Library/OpensslLib/OpensslLibFull.inf | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
|
||||
index fbeb22f5b3..c46e4ac7e5 100644
|
||||
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
|
||||
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
|
||||
@@ -852,16 +852,16 @@
|
||||
# types appropriate to the format string specified.
|
||||
# -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration).
|
||||
#
|
||||
- GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
|
||||
- GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format
|
||||
- GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
|
||||
- GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
|
||||
- GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize -Wno-error=unused-function
|
||||
+ GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-unused-variable
|
||||
+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_NOASM) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS -Wno-unused-variable
|
||||
+ GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-unused-variable
|
||||
+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format -Wno-unused-variable
|
||||
+ GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-unused-variable
|
||||
+ GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-unused-variable
|
||||
+ GCC:*_CLANGDWARF_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize -Wno-unused-variable
|
||||
+ GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize -Wno-error=unused-function -Wno-unused-variable
|
||||
# Revisit after switching to 3.0 branch
|
||||
- GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable
|
||||
+ GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable -Wno-unused-variable
|
||||
|
||||
# suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
|
||||
# 1295: Deprecated declaration <entity> - give arg types
|
31
edk2.spec
31
edk2.spec
@ -1,12 +1,12 @@
|
||||
ExclusiveArch: x86_64 aarch64 riscv64
|
||||
|
||||
# edk2-stable202502
|
||||
%define GITDATE 20250221
|
||||
%define GITCOMMIT fbe0805b2091
|
||||
# edk2-stable202505
|
||||
%define GITDATE 20250523
|
||||
%define GITCOMMIT 6951dfe7d59d
|
||||
%define TOOLCHAIN GCC
|
||||
|
||||
%define OPENSSL_VER 3.0.7
|
||||
%define OPENSSL_HASH 0205b589887203b065154ddc8e8107c4ac8625a1
|
||||
%define OPENSSL_VER 3.5.0
|
||||
%define OPENSSL_HASH 63b528e6476ff36efcf2cda5c083f3f3d7cf9210
|
||||
|
||||
%define DBXDATE 20250224
|
||||
|
||||
@ -25,7 +25,7 @@ ExclusiveArch: x86_64 aarch64 riscv64
|
||||
|
||||
Name: edk2
|
||||
Version: %{GITDATE}
|
||||
Release: 3%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: UEFI firmware for 64-bit virtual machines
|
||||
License: BSD-2-Clause-Patent and Apache-2.0 and MIT
|
||||
URL: http://www.tianocore.org
|
||||
@ -84,12 +84,14 @@ Patch23: 0025-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch
|
||||
Patch24: 0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch
|
||||
Patch25: 0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch
|
||||
Patch26: 0028-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch
|
||||
Patch27: 0029-Revert-CryptoPkg-BaseCryptLib-add-next-parameter-to-.patch
|
||||
Patch28: 0030-Revert-CryptoPkg-add-openssl-providers-fips-include-.patch
|
||||
Patch29: 0031-Revert-openssl-add-more-stubs-for-openssl-3.2.x-RH-o.patch
|
||||
Patch30: 0032-Revert-openssl-adapt-stubs-to-openssl-3.2.x-RH-only.patch
|
||||
Patch31: 0033-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch
|
||||
Patch32: 0034-OvmfPkg-PlatformInitLib-fix-typo.patch
|
||||
Patch27: 0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch
|
||||
Patch28: 0030-CryptoPkg-openssl-update-generated-files.patch
|
||||
Patch29: 0031-CryptoPkg-openssl-add-new-generated-files-to-uncrust.patch
|
||||
Patch30: 0032-CryptoPkg-openssl-add-ossl_bio_print_labeled_buf-stu.patch
|
||||
Patch31: 0033-CryptoPkg-CrtLib-add-strpbrk-implementation.patch
|
||||
Patch32: 0034-CryptoPkg-CrtLib-explicitly-define-INT32-constants.patch
|
||||
Patch33: 0035-CryptoPkg-openssl-turn-off-warning-4130-for-microsof.patch
|
||||
Patch34: 0036-Add-Wno-unused-variable-to-OpensslLibFull-RH-only.patch
|
||||
|
||||
# python3-devel and libuuid-devel are required for building tools.
|
||||
# python3-devel is also needed for varstore template generation and
|
||||
@ -462,6 +464,11 @@ install -m 0644 \
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jun 10 2025 Miroslav Rezanina <mrezanin@redhat.com> - 20250523-1
|
||||
- Rebase to edk2-stable202505 [RHEL-82556]
|
||||
- Resolves: RHEL-82556
|
||||
([edk2,rhel-10] rebase to edk2-stable202505)
|
||||
|
||||
* Fri May 02 2025 Miroslav Rezanina <mrezanin@redhat.com> - 20250221-3
|
||||
- edk2-.distro-make-sure-virt-firmware-is-new-enough.patch [RHEL-85759]
|
||||
- Resolves: RHEL-85759
|
||||
|
4
sources
4
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (DBXUpdate-20250224.x64.bin) = 05640ada78ce94132670ade66676aacdb6cdc311b992769f2ae0413554aa535b9c15213a513355d5e763bef908b961f1ff1d2226081240a6ebd5d4aef7148828
|
||||
SHA512 (dtc-1.7.0.tar.xz) = d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb
|
||||
SHA512 (edk2-fbe0805b2091.tar.xz) = 7cf43e8a928522597e1f90dbe149cb6b4a9aca469a06a909d663509be08f4c7e54c8dfb31d44a6e322f22d2a62108210c84ca74958483cdabc164383434baf83
|
||||
SHA512 (openssl-rhel-0205b589887203b065154ddc8e8107c4ac8625a1.tar.xz) = 07db9535df29873a3884a411e6ab5c3ea6783b9773cd0923f5b2be1273c0e3e984a2f3a80bd1a637995eda018fa6372b6d1eb41000be07cdf5972938c74f51e9
|
||||
SHA512 (edk2-6951dfe7d59d.tar.xz) = b060dd293110c6f3eabe370b52eda3e56070644923ffb7e7738ceb4f6e00b45aa30f08143b3d39aedfc438cf720d9b8bc2aa248db7511b5356605861ebd068fa
|
||||
SHA512 (openssl-rhel-63b528e6476ff36efcf2cda5c083f3f3d7cf9210.tar.xz) = 2982f76e5eb2c94e44b32c1af56ec0020d707412ac8add161b466f853988a1f8ba2094e265a39cfe762cdbc195e1c20545aa66b68d7452231f286abdabdd98a0
|
||||
|
Loading…
Reference in New Issue
Block a user