From ef920c96b25795fcabebfed1954b98f0a190a49c Mon Sep 17 00:00:00 2001
From: Nicholas Sherlock <n.sherlock@gmail.com>
Date: Mon, 25 May 2020 12:50:41 +1200
Subject: [PATCH] Update OpenCore to fix hang caused by cpu=host on QEMU
 5/Proxmox 6.2

Upstream commit acidanthera/OpenCorePkg@6bfd26f3810e82ce0c8f78f1ad4e5ee7471c11e7
---
 EFI/OC/config.plist | 10 ++++------
 Makefile            | 46 ++++++++++++++++++++++-----------------------
 src/AppleSupportPkg |  1 -
 src/OcBinaryData    |  2 +-
 src/OpenCorePkg     |  2 +-
 5 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 160000 src/AppleSupportPkg

diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index e2f098e..e4a3035 100644
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -39,7 +39,7 @@
 				<string>SSDT-PLUG.aml</string>
 			</dict>
 		</array>
-		<key>Block</key>
+		<key>Delete</key>
 		<array>
 			<dict>
 				<key>All</key>
@@ -195,7 +195,7 @@
 				<string>pci8086,2916</string>
 			</dict>
 		</dict>
-		<key>Block</key>
+		<key>Delete</key>
 		<dict>
 			<key>PciRoot(0x0)/Pci(0x1b,0x0)</key>
 			<array>
@@ -576,7 +576,7 @@
 				<data>ZW4tVVM6MA==</data>
 			</dict>
 		</dict>
-		<key>Block</key>
+		<key>Delete</key>
 		<dict>
 			<key>4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14</key>
 			<array>
@@ -724,8 +724,6 @@
 			<false/>
 			<key>ConsoleMode</key>
 			<string></string>
-			<key>DirectGopCacheMode</key>
-			<string></string>
 			<key>DirectGopRendering</key>
 			<false/>
 			<key>IgnoreTextInGraphics</key>
@@ -784,7 +782,7 @@
 			<false/>
 			<key>ReleaseUsbOwnership</key>
 			<false/>
-			<key>RequestBootVarFallback</key>
+			<key>DeduplicateBootOrder</key>
 			<true/>
 			<key>RequestBootVarRouting</key>
 			<true/>
diff --git a/Makefile b/Makefile
index d51e7fa..0570813 100644
--- a/Makefile
+++ b/Makefile
@@ -25,18 +25,21 @@ SUBMODULES = \
 	src/Lilu \
 	src/WhateverGreen \
 	src/OpenCorePkg \
-	src/AppleSupportPkg \
 	src/VirtualSMC \
 	src/OcBinaryData
 
 # Either DEBUG or RELEASE
 OPENCORE_MODE=RELEASE
 
+OPENCORE_UDK_BUILD_DIR=src/OpenCorePkg/UDK/Build/OpenCorePkg/$(OPENCORE_MODE)_XCODE5/X64
+
 .DUMMY : all clean dist
 
+# Avoid submodules having their own directories as a dependency by moving that dependency to the top here:
+# (avoids rebuilding deps after they touch their directories during build)
 all : $(SUBMODULES) $(EFI_FILES)
 
-dist : OpenCore.dmg.gz OpenCoreEFIFolder.zip
+dist : $(SUBMODULES) OpenCore.dmg.gz OpenCoreEFIFolder.zip OpenCore.iso.gz
 
 # Create OpenCore disk image:
 
@@ -104,48 +107,44 @@ src/VirtualSMC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext
 
 # OpenCore:
 
-EFI/OC/OpenCore.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenCore.efi
+EFI/OC/OpenCore.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi
 	cp -a $< $@
 
-EFI/OC/Drivers/OpenRuntime.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenRuntime.efi
+EFI/OC/Drivers/OpenRuntime.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenRuntime.efi
 	mkdir -p EFI/OC/Drivers
 	cp -a $< $@
 
-EFI/BOOT/BOOTx64.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/BOOTx64.efi
-	mkdir -p EFI/BOOT
+EFI/OC/Drivers/VBoxHfs.efi : $(OPENCORE_UDK_BUILD_DIR)/VBoxHfs.efi
+	mkdir -p EFI/OC/Drivers
 	cp -a $< $@
 
-src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenCore.efi src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenRuntime.efi \
-src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/BOOTx64.efi src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/Shell.efi \
- :
-	sed -i'.original' -e 's/^ARCHS=(X64 IA32)$$/ARCHS=(X64)/' src/OpenCorePkg/macbuild.tool
-	cd src/OpenCorePkg && ./macbuild.tool --skip-package
-
-# VBoxHfs:
-
-EFI/OC/Drivers/VBoxHfs.efi : src/AppleSupportPkg/Binaries/RELEASE/VBoxHfs.efi
-	mkdir -p EFI/OC/Drivers
+EFI/BOOT/BOOTx64.efi : $(OPENCORE_UDK_BUILD_DIR)/BOOTx64.efi
+	mkdir -p EFI/BOOT
 	cp -a $< $@
 
-src/AppleSupportPkg/Binaries/RELEASE/VBoxHfs.efi :
-	cd src/AppleSupportPkg && ./macbuild.tool --skip-package
+$(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi $(OPENCORE_UDK_BUILD_DIR)/OpenRuntime.efi \
+$(OPENCORE_UDK_BUILD_DIR)/BOOTx64.efi $(OPENCORE_UDK_BUILD_DIR)/Shell.efi \
+$(OPENCORE_UDK_BUILD_DIR)/ResetSystem.efi $(OPENCORE_UDK_BUILD_DIR)/OpenCanopy.efi \
+$(OPENCORE_UDK_BUILD_DIR)/VBoxHfs.efi \
+ :
+	cd src/OpenCorePkg && ARCHS=X64 ./build_oc.tool --skip-package $(OPENCORE_MODE)
 
 # Tools
 
-EFI/OC/Tools/Shell.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/Shell.efi
+EFI/OC/Tools/Shell.efi : $(OPENCORE_UDK_BUILD_DIR)/Shell.efi
 	mkdir -p EFI/OC/Tools
 	cp -a $< $@
 
-EFI/OC/Tools/ResetSystem.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/ResetSystem.efi
+EFI/OC/Tools/ResetSystem.efi : $(OPENCORE_UDK_BUILD_DIR)/ResetSystem.efi
 	mkdir -p EFI/OC/Tools
 	cp -a $< $@
 
-EFI/OC/Drivers/OpenCanopy.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenCanopy.efi
+EFI/OC/Drivers/OpenCanopy.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenCanopy.efi
 	mkdir -p EFI/OC/Drivers
 	cp -a $< $@
 
 EFI/OC/Resources : src/OcBinaryData/Resources
-	cp -a $< $@
+	cp -a $< EFI/OC/
 
 # Fetch submodules:
 
@@ -156,4 +155,5 @@ EFI/BOOT/ EFI/OC/Drivers/ EFI/OC/Tools/ :
 	mkdir $@
 
 clean :
-	rm -rf OpenCore.dmg OpenCoreEFIFolder.zip src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/Binaries src/AppleALC/build $(KEXTS) $(DRIVERS) $(TOOLS) $(MISC)
+	rm -rf OpenCore.dmg OpenCoreEFIFolder.zip OpenCore-Image/ src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/UDK/Build \
+		src/AppleALC/build $(KEXTS) $(DRIVERS) $(TOOLS) $(MISC)
diff --git a/src/AppleSupportPkg b/src/AppleSupportPkg
deleted file mode 160000
index 45eed55..0000000
--- a/src/AppleSupportPkg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45eed5556a8816b4c43a531794519c76b93a9683
diff --git a/src/OcBinaryData b/src/OcBinaryData
index d457a7f..88bab6c 160000
--- a/src/OcBinaryData
+++ b/src/OcBinaryData
@@ -1 +1 @@
-Subproject commit d457a7f3dfa71751a55099fe11b9ff620d63e13b
+Subproject commit 88bab6cf94655a0beaf82d279dbf5a5871e74612
diff --git a/src/OpenCorePkg b/src/OpenCorePkg
index d11b9f8..2f41d2a 160000
--- a/src/OpenCorePkg
+++ b/src/OpenCorePkg
@@ -1 +1 @@
-Subproject commit d11b9f8ad358bf426e9ccef12260585cb7873404
+Subproject commit 2f41d2abd1b2c71ae910163f63b8de1db1474e5b