Changeset 80921 in vbox

Timestamp:

Sep 20, 2019 11:32:48 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133498

Message:

EFI/FirmwareNew: Fix inclusion of VBoxPeCoffLib as it contains support for fat/universal EFI binaries required to load boot.efi provided by macOS Mountain Lion and older, bugref:4643

File:

• trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgX64.dsc (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgX64.dsc

@@ -144 +144 @@
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
 !else
-!ifdef $(SOURCE_DEBUG_ENABLE)
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-!else
   PeCoffLib|VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
-!endif
 !endif
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -196 +192 @@
 
 !ifdef $(SOURCE_DEBUG_ENABLE)
+!ifdef $(VBOX)
+  PeCoffExtraActionLib|VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.inf
+!else
   PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
+!endif
   DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
 !else
@@ -304 +304 @@
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
 !else
-!ifdef $(SOURCE_DEBUG_ENABLE)
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+  PeCoffLib|VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
+!ifdef $(SOURCE_DEBUG_ENABLE)
+  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
 !else
   DebugLib|VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
-  PeCoffLib|VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
 !endif
 !endif