Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ovmf for openSUSE:Factory checked in 
at 2021-12-24 20:23:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ovmf (Old)
 and      /work/SRC/openSUSE:Factory/.ovmf.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ovmf"

Fri Dec 24 20:23:04 2021 rev:70 rq:942288 version:202111

Changes:
--------
--- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes        2021-12-13 
20:42:15.216469329 +0100
+++ /work/SRC/openSUSE:Factory/.ovmf.new.2520/ovmf.changes      2021-12-24 
20:23:28.958028930 +0100
@@ -1,0 +2,289 @@
+Thu Dec 23 03:31:18 UTC 2021 - [email protected]
+
+- Removed useless patch files because they are merged to edk2-stable202111
+    - ovmf-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch
+    - ovmf-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch
+    - ovmf-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch
+- Updated URL to the edk2 repo on github
+- Use downloaded edk2-edk2-stable%{version}.tar.gz instead of the URL
+  for Source0 because the edk2-edk2-stable202111 tarball is broken
+  in tianocore repo which can not pass the "osc service runall download_files"
+  testing. 
+   - We ill change it back to the following setting when upstream fixed 
tarball:
+       Source0:        
https://github.com/tianocore/edk2/releases/download/edk2-stable%{version}/edk2-edk2-stable%{version}.tar.gz
+
+-------------------------------------------------------------------
+Tue Dec 21 03:29:06 UTC 2021 - Joey Lee <[email protected]>
+
+- Update to edk2-stable202111
+    - Features (https://github.com/tianocore/edk2/releases):
+       Add SSDT CPU topology generator
+       Support ACPI 6.4 in GTDT parser and generator
+       Support ACPI 6.4 in DynamicTables FADT parser
+       Support ACPI 6.4 in Acpiview PCCT parser
+       Support ACPI 6.4 in Acpiview HMAT parser
+       Add support for the microvm machine type (qemu)
+       OVMF/ArmVirt: add support for virtio-mmio 1.0
+       IntelFsp2Pkg: adopt FSP 2.3 specification
+       UefiCpuPkg VTF0 X64: Build page tables using Linear-Address Translation 
to a 1-GByte Page
+       Enable wildcard host name matching in HTTPS/TLS implementation
+       Add QuickSort function into BaseLib
+       Add SMM NV variable support in universal UEFI payload
+       Add TDVF to OvmfPkg
+       Make package and platform builds reproducible across source format 
changes
+    - Patches (git log --oneline --reverse 
edk2-stable202105~..edk2-stable202108):
+       7b4a99be8a CryptoPkg: BaseCryptLib fix incorrect param order
+       82f7e315d6 MdeModulePkg/PeiCore: Remove MigrateSecModulesInFv()
+       8b15024dc7 Maintainers: Add kraxel as Reviewer to ArmVirtPkg and OvmfPkg
+       80e67af9af OvmfPkg: introduce a common work area
+       ab77b6031b OvmfPkg/ResetVector: update SEV support to use new work area 
format
+       b9af5037b2 OvmfPkg/ResetVector: move the GHCB page setup in AmdSev.asm
+       a82bad9730 ArmPkg/GicV3Dxe: Don't signal EOI on arbitrary interrupts
+       94e465e5cb OvmfPkg/Virtio10: Add virtio-mmio 1.0 defines
+       08293e43da OvmfPkg/VirtioMmioDeviceLib: Add virtio 1.0 detection.
+       212a2b9bb8 OvmfPkg/VirtioMmioDeviceLib: virtio 1.0: Fix SetPageSize.
+       537a724421 OvmfPkg/VirtioMmioDeviceLib: virtio 1.0: Fix SetQueueAddress
+       6a3e9576b8 OvmfPkg/VirtioMmioDeviceLib: virtio 1.0: Add default QueueNum
+       ae12188cf8 OvmfPkg/VirtioMmioDeviceLib: virtio 1.0: Adapt feature bit 
handling
+       77d5fa8024 OvmfPkg/VirtioMmioDeviceLib: enable virtio 1.0
+       b04453d36b MdeModulePkg/EbcDxe: Mitigate memcpy intrinsics
+       dc995ce906 MdeModulePkg: Add BootDiscoveryPolicyOld variable.
+       443300be46 MdePkg:Update IndustryStandard/Nvme.h with Nvme amdin 
controller data
+       0f11537548 MdeModulePkg:Increase Nvme capacity display
+       cae735f613 ArmPkg: Enable boot discovery policy for ARM package.
+       cb0d24637d OvmfPkg/OvmfXen: set PcdAcpiS3Enable at initialization
+       28152333bc OvmfPkg/LockBoxLib: use PcdAcpiS3Enable to detect S3 support
+       52e2dabc0f OvmfPkg/PlatformBootManagerLib: use PcdAcpiS3Enable to 
detect S3 support
+       5b5f10d746 OvmfPkg/SmmControl2Dxe: use PcdAcpiS3Enable to detect S3 
support
+       9f3eda177a OvmfPkg/OvmfXen: add QemuKernelLoaderFsDxe
+       f0fe55bca4 UefiPayloadPkg: Fix the build error when enable Core ci for 
UefiPayloadPkg
+       5d34cc49d5 UefiCpuPkg/PiSmmCpuDxeSmm: Update mPatchCetSupported set 
condition
+       cdda3f74a1 UefiPayloadPkg/UefiPayloadEntry: Fix memory corruption
+       3b3f882288 MdeModulePkg/PiSmmCore: Drop deprecated image profiling 
commands
+       b170806518 UefiCpuPkg: Clean up save state boundary checks and comments.
+       12e33dca4c IntelFsp2Pkg: Support Config File and Binary delta comparison
+       63fddc98e0 UefiPayloadPkg: Create .yaml file in UefiPayloadPkg
+       e3ee8c8dbd .azurepipelines: Add UefiPayloadPkg in gate-build-job.yml 
and CISetting.py
+       b6bc203375 MdeModulePkg/HiiDatabaseDxe:remove dead code block
+       c5e805ffe1 MdeModulePkg: Fix typo of "memory" in RamDiskDxe debug 
message
+       81d71fb86e Maintainers.txt: Update maintainer/reviewer roles in 
MdeModulePkg
+       edf8bc6d24 SecurityPkg/MemoryOverwriteControl: Add missing argument to 
DEBUG print
+       4473834e7d OvmfPkg/OvmfXen: Fix build with QemuKernelLoaderFsDxe
+       a7cf2c5664 RedfishPkg: Fix various typos
+       851785ea67 UefiPayloadPkg: Include more modules in UefiPayloadPkg.
+       d248516b3a UefiPayloadPkg: Include Network modules in UefiPayloadPkg.
+       6c7d6d4a5e UefiCpuPkg: ResetVector Tool Support for Python 3
+       cf7c650592 UefiCpuPkg: ResetVector Tool additional debug prints
+       d96df7e993 UefiPayloadPkg: Fix the bug in dump guid HOB info functions
+       dcd3d63f4f UefiPayloadPkg: Dump hob info from 
gEdkiiBootManagerMenuFileGuid
+       610d8073f2 SecurityPkg/TPM: Import PeiDxeTpmPlatformHierarchyLib.c from 
edk2-platforms
+       4d5f39cd22 SecurityPkg/TPM: Fix bugs in imported 
PeiDxeTpmPlatformHierarchyLib
+       ebbc8ab2cd SecrutiyPkg/Tcg: Import Tcg2PlatformDxe from edk2-platforms
+       2906e572c6 SecurityPkg/Tcg: Make Tcg2PlatformDxe buildable and fix 
style issues
+       f108178c56 SecurityPkg: Introduce new PCD PcdRandomizePlatformHierarchy
+       a4867dea2a SecurityPkg/Tcg: Import Tcg2PlatformPei from edk2-platforms
+       2fa89c8e11 SecurityPkg/Tcg: Make Tcg2PlatformPei buildable and fix 
style issues
+       3b69fcf5f8 SecurityPkg: Add references to header and inf files to 
SecurityPkg
+       6c80564b89 MdeModulePkg/Core/Pei: Fix typo in function descriptions
+       6f501a7c9b MdeModulePkg/Core/Pei: Make migrated PEIM message verbose
+       c19d18136e MdeModulePkg/Core/Pei: Fix pointer size mismatch in 
EvacuateTempRam()
+       f4e72cf9d6 UefiPayloadPkg: Add script to build UniversalPayload in 
UefiPayloadPkg
+       bda3546c55 UefiPayloadPkg: Fix the warning when building UefiPayloadPkg 
with IA32+X64
+       010753b7e7 UefiCpuPkg: Refactor initialization of CPU features during 
S3 resume
+       89f7ed8b29 UefiCpuPkg: Prevent from re-initializing CPU features during 
S3 resume
+       60d8bb9f28 UefiCpuPkg: VTF0 Linear-Address Translation to a 1-GByte 
Page till 512GB
+       ac6388add4 ArmPkg/ProcessorSubClassDxe: Fix the format of ProcessorId
+       e3e47d7963 UefiCpuPkg: SecCoreNative without ResetVector
+       542cba73d2 SecurityPkg: Add debug log for indicating IBB verified OBB 
successfully
+       f334c5a41d IntelFsp2WrapperPkg: Make PcdFspModeSelection dynamic
+       79019c7a42 OvmfPkg: set a default value for the WorkAreaHeader PCD
+       fdeff3fdae EmbeddedPkg: Remove duplicate libfdt.h include
+       f2a7e24e38 EmbeddedPkg: AndroidBootImgBoot error handling updates
+       c0cd26f43c EmbeddedPkg: Install FDT if UpdateDtb is not present
+       7ea7f9c077 EmbeddedPkg: Add LoadFile2 for linux initrd
+       d60915b751 UefiPayloadPkg: Add Macro to enable or disable some drivers.
+       46b4606ba2 MdeModulePkg/PciBusDxe: Improve the flow of testing support 
attributes
+       f57040b038 MdeModulePkg/BootManagerMenuApp: Limit string drawing within 
one line
+       b0f1b1c5fd MdePkg: Fix DEVICE_SECURITY_EVENT_DATA_HEADER version 
definition
+       cc5a67269e UefiPayloadPkg: Build a HOB from bootloader ACPI table
+       dc430ccf3f UefiPayloadPkg: Use dummy constructor for PlatformHookLib
+       4a1899dd79 UefiPayloadPkg: Add ".upld_info" in universal payload
+       2ea0a0a414 BaseTools: Switch to downloading the ARM compiler from Arm's 
site
+       1ce6ceb75b BaseTools: Switch to downloading the AARCH64 compiler from 
Arm's site
+       c214128a38 BaseTools/GenMake: Use ToolDefinition as fallback option
+       259c184c8f BaseTools/build: Set MakefileName
+       445c39f757 BaseTools: Remove Makefile/MakefileName fields
+       c7d5b046d9 BaseTools: Remove hard-coded strings for target and tools_def
+       442e46d3b6 UefiPayloadPkg: Update maximum logic processor to 256
+       499c4608b1 OvmfPkg/TPM PPI: Connect default consoles for user 
interaction
+       b8675deaa8 OvmfPkg: Handle TPM 2 physical presence opcodes much earlier
+       8ab8fbc016 OvmfPkg: Reference new Tcg2PlatformDxe in the build system 
for compilation
+       bd298d7593 OvmfPkg: Reference new Tcg2PlatformPei in the build system
+       f86de75862 MdePkg: MmCommunication: Added definition of MM 
Communication PPI
+       8b4bb94f64 MdePkg: CI YAML: Added new GUID to ignore duplicate list
+       9e950cda6a MdeModulePkg: CI YAML: Added new GUID to ignore duplicate 
list
+       2273799677 SecurityPkg: Fix SecureBootDefaultKeysDxe failed to start
+       422e5d2f7f UefiPayloadPkg: Remove asm code and sharing libraries
+       0875443f7e DynamicTablesPkg: Extract AcpiHelperLib from TableHelperLib
+       20775950c6 DynamicTablesPkg: Update TableHelperLib.inf
+       1ad5182500 DynamicTablesPkg: Rename single char input parameter
+       653113412f DynamicTablesPkg: Add HexFromAscii() to AcpiHelperLib
+       72ab552554 DynamicTablesPkg: Add AmlGetEisaIdFromString() to 
AcpiHelperLib
+       96e006b37e DynamicTablesPkg: Add Configuration Manager Object parser
+       235ff9fcd1 DynamicTablesPkg: Use %a formatter in AmlDbgPrint
+       7a8c037e9e DynamicTablesPkg: Update DynamicTablesPkg.ci.yaml
+       691c5f7762 DynamicTablesPkg: Deprecate Crs specific methods in AmlLib
+       22873f58c4 DynamicTablesPkg: Rework AmlResourceDataCodegen.c/h
+       4cc1458dbe IntelFsp2Pkg: Adopt FSP 2.3 specification.
+       c49cb8f30e ArmPkg: SmbiosMiscDxe: Don't populate ExtendedBiosSize when 
size < 16MB
+       282122ec5f ArmVirtPkg/TPM: Add a NULL implementation of 
TpmPlatformHierarchyLib
+       b3685956d2 ArmVirtPkg: Reference new TPM classes in the build system 
for compilation
+       c806b76865 ArmVirtPkg: Disable the TPM2 platform hierarchy
+       606340fba3 OvmfPkg/Microvm: copy OvmfPkgX64 files as-is
+       4932f05a00 OvmfPkg/Microvm: rename output files, fix includes
+       2a49c19b9e OvmfPkg/Microvm: no smm
+       60d55c4156 OvmfPkg/Microvm: no secure boot
+       0569c52b15 OvmfPkg/Microvm: no tpm
+       06fa1f1931 OvmfPkg/Microvm: no sev
+       6073bf6cd8 OvmfPkg/Microvm: no csm
+       b9dd64b80e OvmfPkg/Microvm: no emulated scsi
+       27de86ae41 OvmfPkg/Microvm: use MdePkg/Library/SecPeiDxeTimerLibCpu
+       76602f45dc OvmfPkg/Microvm: use XenTimerDxe (lapic timer)
+       6a8e9ad24b OvmfPkg/Microvm: PlatformPei/MemDetect tweaks
+       8583b57c5c OvmfPkg/Microvm: PlatformPei/Platform memory map tweaks
+       bf02d73e74 OvmfPkg/Microvm: PlatformPei/Platform: add id.
+       1d3e89f349 OvmfPkg/ResetSystemLib: add driver for microvm
+       2c467c9be2 OvmfPkg/Microvm: BdsPlatform: PciAcpiInitialization tweak.
+       8456785986 OvmfPkg/Microvm: use PciHostBridgeLibNull
+       55f47d2299 OvmfPkg/Microvm: wire up serial console, drop super-io
+       862e814de4 OvmfPkg/Microvm: add Maintainers.txt entry
+       06a326caf1 DynamicTablesPkg: Update FADT generator to ACPI 6.4
+       f09dbf20b9 DynamicTablesPkg: Rename SBSA generic watchdog
+       942c9bd357 ShellPkg: Update Acpiview GTDT parser to ACPI 6.4
+       80e67bcb23 ShellPkg: Update Acpiview PCCT parser to ACPI 6.4
+       b4da6c29f1 ShellPkg: Add Type 5 PCC Subspace Structure parser
+       5ece2ad36c MdeModulePkg/Core/Dxe: Add lock protection in 
CoreLocateHandleBuffer()
+       30400318a2 ShellPkg: Update Acpiview HMAT parser to ACPI spec version 
6.4
+       71c3c9c0c4 DynamicTablesPkg: Remove unnecessary includes
+       25cf58a163 DynamicTablesPkg: Add missing parameter check
+       bfaf7c8b9e DynamicTablesPkg: Add AddSsdtAcpiHeader()
+       28b2df475f DynamicTablesPkg: Add AmlRdSetEndTagChecksum()
+       74addfeab6 DynamicTablesPkg: Add AmlSetRdListCheckSum()
+       7b2022d39e DynamicTablesPkg: Set EndTag's Checksum if RdList is modified
+       2dd7dd3952 DynamicTablesPkg: Clear pointer in node creation fcts
+       37bd08176c DynamicTablesPkg: Update error handling for node creation
+       6d2777d85f DynamicTablesPkg: Make AmlNodeGetIntegerValue public
+       f995f8672b DynamicTablesPkg: AML Code generation for Register()
+       9454d1ebcb DynamicTablesPkg: AML Code generation for Resource data 
EndTag
+       1e33479b39 DynamicTablesPkg: AML code generation for a Package
+       12e65fd258 DynamicTablesPkg: Helper function to compute package length
+       ce15936f2f DynamicTablesPkg: AML code generation for a ResourceTemplate
+       de62ccbf4f DynamicTablesPkg: AML code generation for a Method
+       e2d7b4950b DynamicTablesPkg: AML code generation to Return a NameString
+       3e958e93ce DynamicTablesPkg: AML code generation for a Method returning 
a NS
+       018a962d92 DynamicTablesPkg: AML code generation for a _LPI object
+       a5e36ad9bc DynamicTablesPkg: AML code generation to add an _LPI state
+       f17ef10e63 DynamicTablesPkg: Add CM_ARM_LPI_INFO object
+       769e63999f DynamicTablesPkg: SSDT CPU topology and LPI state generator
+       19ee56c4b3 UefiPayloadPkg: Add a macro to select the SecurityStubDxe 
driver.
+       782d018703 MdePkg: Add ProcessorUpgradeSocketLGA4677 from SMBIOS 3.5.0
+       ba4ae92234 ShellPkg: Support ProcessorUpgradeSocketLGA4677 from SMBIOS 
3.5.0
+       f22feb0e3b CryptoPkg/BaseCryptLib: Eliminate extra buffer copy in 
Pkcs7Verify()
+       4225a464c6 MdePkg/BaseLib: Add QuickSort function on BaseLib
+       6ed6abd6c1 BaseTools: Change RealPath to AbsPath
+       978d428ec3 UefiPayloadPkg: Add PCI root bridge info hob support for SBL
+       43b3840873 MdeModulePkg/Sd: Corrections for Extra.uni files
+       a7fcab7aa3 MdeModulePkg/Core/Dxe: Acquire a lock when iterating 
gHandleList
+       e40fefafa9 ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg
++++ 92 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/ovmf/ovmf.changes
++++ and /work/SRC/openSUSE:Factory/.ovmf.new.2520/ovmf.changes

Old:
----
  edk2-edk2-stable202108.tar.gz
  ovmf-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch
  ovmf-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch
  ovmf-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch

New:
----
  edk2-edk2-stable202111.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ovmf.spec ++++++
--- /var/tmp/diff_new_pack.XPfneb/_old  2021-12-24 20:23:29.994029473 +0100
+++ /var/tmp/diff_new_pack.XPfneb/_new  2021-12-24 20:23:29.998029475 +0100
@@ -22,13 +22,13 @@
 %global softfloat_version b64af41c3276f
 
 Name:           ovmf
-Version:        202108
+Version:        202111
 Release:        0
 Summary:        Open Virtual Machine Firmware
 License:        BSD-2-Clause-Patent
 Group:          System/Emulators/PC
-Url:            
https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2
-Source0:        
https://github.com/tianocore/edk2/releases/download/edk2-stable%{version}/edk2-edk2-stable%{version}.tar.gz
+Url:            https://github.com/tianocore/edk2
+Source0:        edk2-edk2-stable%{version}.tar.gz
 Source1:        
https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz
 Source111:      
https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz.asc
 Source112:      openssl.keyring
@@ -51,9 +51,6 @@
 Patch4:         %{name}-disable-ia32-firmware-piepic.patch
 Patch5:         %{name}-set-fixed-enroll-time.patch
 Patch6:         %{name}-disable-brotli.patch
-Patch7:         
%{name}-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch
-Patch8:         %{name}-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch
-Patch9:         
%{name}-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch
 BuildRequires:  bc
 BuildRequires:  cross-arm-binutils
 BuildRequires:  cross-arm-gcc%{gcc_version}
@@ -169,9 +166,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 # add openssl
 pushd CryptoPkg/Library/OpensslLib/openssl


++++++ edk2-edk2-stable202108.tar.gz -> edk2-edk2-stable202111.tar.gz ++++++
/work/SRC/openSUSE:Factory/ovmf/edk2-edk2-stable202108.tar.gz 
/work/SRC/openSUSE:Factory/.ovmf.new.2520/edk2-edk2-stable202111.tar.gz differ: 
char 16, line 1





++++++ ovmf-add-exclude-shell-flag.patch ++++++
--- /var/tmp/diff_new_pack.XPfneb/_old  2021-12-24 20:23:30.154029556 +0100
+++ /var/tmp/diff_new_pack.XPfneb/_new  2021-12-24 20:23:30.154029556 +0100
@@ -1,8 +1,8 @@
-Index: edk2-edk2-stable202102/OvmfPkg/OvmfPkgX64.fdf
+Index: edk2-edk2-stable202111/OvmfPkg/OvmfPkgX64.fdf
 ===================================================================
---- edk2-edk2-stable202102.orig/OvmfPkg/OvmfPkgX64.fdf
-+++ edk2-edk2-stable202102/OvmfPkg/OvmfPkgX64.fdf
-@@ -310,7 +310,9 @@ INF  ShellPkg/DynamicCommand/TftpDynamic
+--- edk2-edk2-stable202111.orig/OvmfPkg/OvmfPkgX64.fdf
++++ edk2-edk2-stable202111/OvmfPkg/OvmfPkgX64.fdf
+@@ -315,7 +315,9 @@ INF  ShellPkg/DynamicCommand/TftpDynamic
  INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
  INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
  !endif
@@ -12,11 +12,11 @@
  
  INF MdeModulePkg/Logo/LogoDxe.inf
  
-Index: edk2-edk2-stable202102/OvmfPkg/OvmfPkgIa32X64.fdf
+Index: edk2-edk2-stable202111/OvmfPkg/OvmfPkgIa32X64.fdf
 ===================================================================
---- edk2-edk2-stable202102.orig/OvmfPkg/OvmfPkgIa32X64.fdf
-+++ edk2-edk2-stable202102/OvmfPkg/OvmfPkgIa32X64.fdf
-@@ -298,7 +298,9 @@ INF  ShellPkg/DynamicCommand/TftpDynamic
+--- edk2-edk2-stable202111.orig/OvmfPkg/OvmfPkgIa32X64.fdf
++++ edk2-edk2-stable202111/OvmfPkg/OvmfPkgIa32X64.fdf
+@@ -299,7 +299,9 @@ INF  ShellPkg/DynamicCommand/TftpDynamic
  INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
  INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
  !endif

++++++ ovmf-gdb-symbols.patch ++++++
--- /var/tmp/diff_new_pack.XPfneb/_old  2021-12-24 20:23:30.170029565 +0100
+++ /var/tmp/diff_new_pack.XPfneb/_new  2021-12-24 20:23:30.174029567 +0100
@@ -14,11 +14,10 @@
  create mode 100644 DebugPkg/GdbSyms/GdbSyms.inf
  create mode 100644 DebugPkg/Scripts/gdb_uefi.py
 
-diff --git a/DebugPkg/DebugPkg.dec b/DebugPkg/DebugPkg.dec
-new file mode 100644
-index 000000000000..e12401de3e4a
+Index: edk2-edk2-stable202111/DebugPkg/DebugPkg.dec
+===================================================================
 --- /dev/null
-+++ b/DebugPkg/DebugPkg.dec
++++ edk2-edk2-stable202111/DebugPkg/DebugPkg.dec
 @@ -0,0 +1,34 @@
 +## @file
 +#  Debug package - various useful stuff for debugging.
@@ -54,12 +53,11 @@
 +
 +[LibraryClasses]
 +
-diff --git a/DebugPkg/GdbSyms/GdbSyms.c b/DebugPkg/GdbSyms/GdbSyms.c
-new file mode 100644
-index 000000000000..2551dfab90b6
+Index: edk2-edk2-stable202111/DebugPkg/GdbSyms/GdbSyms.c
+===================================================================
 --- /dev/null
-+++ b/DebugPkg/GdbSyms/GdbSyms.c
-@@ -0,0 +1,70 @@
++++ edk2-edk2-stable202111/DebugPkg/GdbSyms/GdbSyms.c
+@@ -0,0 +1,78 @@
 +/** @file
 +
 +  Bare-minimum GDB symbols needed for reloading symbols.
@@ -126,15 +124,22 @@
 +    (UINTN) &EIDCME |
 +     1
 +    ;
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &ESTP));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EDIITH));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDH));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIOHU));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDDE));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDCNE));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDCRE));
++  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDCME));
 +  return !!Dummy & EFI_SUCCESS;
 +}
 +
 +
-diff --git a/DebugPkg/GdbSyms/GdbSyms.inf b/DebugPkg/GdbSyms/GdbSyms.inf
-new file mode 100644
-index 000000000000..afb78871b818
+Index: edk2-edk2-stable202111/DebugPkg/GdbSyms/GdbSyms.inf
+===================================================================
 --- /dev/null
-+++ b/DebugPkg/GdbSyms/GdbSyms.inf
++++ edk2-edk2-stable202111/DebugPkg/GdbSyms/GdbSyms.inf
 @@ -0,0 +1,57 @@
 +## @file
 +#
@@ -193,12 +198,11 @@
 +[Depex]
 +  TRUE
 +
-diff --git a/DebugPkg/Scripts/gdb_uefi.py b/DebugPkg/Scripts/gdb_uefi.py
-new file mode 100644
-index 000000000000..dac215c53893
+Index: edk2-edk2-stable202111/DebugPkg/Scripts/gdb_uefi.py
+===================================================================
 --- /dev/null
-+++ b/DebugPkg/Scripts/gdb_uefi.py
-@@ -0,0 +1,348 @@
++++ edk2-edk2-stable202111/DebugPkg/Scripts/gdb_uefi.py
+@@ -0,0 +1,350 @@
 +"""
 +Allows loading TianoCore symbols into a GDB session attached to EFI
 +Firmware.
@@ -219,6 +223,7 @@
 +import array
 +import getopt
 +import binascii
++import re
 +
 +__license__ = "BSD"
 +__version = "1.0.0"
@@ -444,6 +449,7 @@
 +            base = base + opt['SizeOfHeaders']
 +        if sym_name != self.EINVAL:
 +            sym_name = sym_name.cast (self.ptype('CHAR8')).string ()
++            sym_name = re.sub(r"\.dll$", ".debug", sym_name)
 +            syms.append ("add-symbol-file %s 0x%x" % \
 +                             (sym_name,
 +                              long (base)))
@@ -547,87 +553,14 @@
 +ReloadUefi ()
 +
 +
--- 
-2.25.1
-
-
-From 2554f33897c7caa946110444992cb8edb01eb60c Mon Sep 17 00:00:00 2001
-From: Gary Ching-Pang Lin <[email protected]>
-Date: Tue, 24 Jun 2014 11:59:02 +0800
-Subject: [PATCH 2/3] Compile DebugPkg and load .debug files
-
----
- DebugPkg/Scripts/gdb_uefi.py | 2 ++
- OvmfPkg/OvmfPkgX64.dsc       | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/DebugPkg/Scripts/gdb_uefi.py b/DebugPkg/Scripts/gdb_uefi.py
-index dac215c53893..3db87a4de430 100644
---- a/DebugPkg/Scripts/gdb_uefi.py
-+++ b/DebugPkg/Scripts/gdb_uefi.py
-@@ -18,6 +18,7 @@ images were converted from MACH-O or ELF binaries.
- import array
- import getopt
- import binascii
-+import re
- 
- __license__ = "BSD"
- __version = "1.0.0"
-@@ -243,6 +244,7 @@ class ReloadUefi (gdb.Command):
-             base = base + opt['SizeOfHeaders']
-         if sym_name != self.EINVAL:
-             sym_name = sym_name.cast (self.ptype('CHAR8')).string ()
-+            sym_name = re.sub(r"\.dll$", ".debug", sym_name)
-             syms.append ("add-symbol-file %s 0x%x" % \
-                              (sym_name,
-                               long (base)))
-diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index f7fe75ebf531..05a010659440 100644
---- a/OvmfPkg/OvmfPkgX64.dsc
-+++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -1011,3 +1011,5 @@ [Components]
-       
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
+Index: edk2-edk2-stable202111/OvmfPkg/OvmfPkgX64.dsc
+===================================================================
+--- edk2-edk2-stable202111.orig/OvmfPkg/OvmfPkgX64.dsc
++++ edk2-edk2-stable202111/OvmfPkg/OvmfPkgX64.dsc
+@@ -1056,3 +1056,5 @@
+       
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
    }
  !endif
 +
 +  DebugPkg/GdbSyms/GdbSyms.inf
--- 
-2.25.1
-
-
-From adf37c44c49f3bc6a654e5d8efd8ee28558d51ab Mon Sep 17 00:00:00 2001
-From: Gary Lin <[email protected]>
-Date: Mon, 16 Oct 2017 16:32:27 +0800
-Subject: [PATCH 3/3] DebugPkg: Print the local variables
-
-With the "--whole-archive" linker option, several symbols in GdbSyms.dll
-such as EFI_SYSTEM_TABLE_POINTER would be dropped, and the gdb_uefi
-script could not find those symbols anymore. This commit add a few
-useless DEBUG statements to keep those symbols.
----
- DebugPkg/GdbSyms/GdbSyms.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/DebugPkg/GdbSyms/GdbSyms.c b/DebugPkg/GdbSyms/GdbSyms.c
-index 2551dfab90b6..0d591e5a8f22 100644
---- a/DebugPkg/GdbSyms/GdbSyms.c
-+++ b/DebugPkg/GdbSyms/GdbSyms.c
-@@ -64,6 +64,14 @@ Initialize (
-     (UINTN) &EIDCME |
-      1
-     ;
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &ESTP));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EDIITH));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDH));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIOHU));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDDE));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDCNE));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDCRE));
-+  DEBUG ((DEBUG_VERBOSE, "%a: %llx\n", __FUNCTION__, &EIDCME));
-   return !!Dummy & EFI_SUCCESS;
- }
- 
--- 
-2.25.1
-
 

Reply via email to