Archives/thenickdude_KVM-Opencore
1
0
Fork 0
mirror of https://github.com/thenickdude/KVM-Opencore.git synced 2024-10-27 20:34:10 +00:00
Code Issues Projects Releases Wiki Activity

Update OpenCore to fix hang caused by cpu=host on QEMU 5/Proxmox 6.2

Browse Source 
Upstream commit acidanthera/OpenCorePkg@6bfd26f381
This commit is contained in:
Nicholas Sherlock 2020-05-25 12:50:41 +12:00
parent d35185375c
commit ef920c96b2
5 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
EFI/OC/config.plist
View File

@ -39,7 +39,7 @@
<string>SSDT-PLUG.aml</string> <string>SSDT-PLUG.aml</string>
</dict> </dict>
</array> </array>
<key>Block</key> <key>Delete</key>
<array> <array>
<dict> <dict>
<key>All</key> <key>All</key>
@ -195,7 +195,7 @@
<string>pci8086,2916</string> <string>pci8086,2916</string>
</dict> </dict>
</dict> </dict>
<key>Block</key> <key>Delete</key>
<dict> <dict>
<key>PciRoot(0x0)/Pci(0x1b,0x0)</key> <key>PciRoot(0x0)/Pci(0x1b,0x0)</key>
<array> <array>
@ -576,7 +576,7 @@
<data>ZW4tVVM6MA==</data> <data>ZW4tVVM6MA==</data>
</dict> </dict>
</dict> </dict>
<key>Block</key> <key>Delete</key>
<dict> <dict>
<key>4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14</key> <key>4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14</key>
<array> <array>
@ -724,8 +724,6 @@
<false/> <false/>
<key>ConsoleMode</key> <key>ConsoleMode</key>
<string></string> <string></string>
<key>DirectGopCacheMode</key>
<string></string>
<key>DirectGopRendering</key> <key>DirectGopRendering</key>
<false/> <false/>
<key>IgnoreTextInGraphics</key> <key>IgnoreTextInGraphics</key>
@ -784,7 +782,7 @@
<false/> <false/>
<key>ReleaseUsbOwnership</key> <key>ReleaseUsbOwnership</key>
<false/> <false/>
<key>RequestBootVarFallback</key> <key>DeduplicateBootOrder</key>
<true/> <true/>
<key>RequestBootVarRouting</key> <key>RequestBootVarRouting</key>
<true/> <true/>

46
Makefile
View File

@ -25,18 +25,21 @@ SUBMODULES = \
src/Lilu \ src/Lilu \
src/WhateverGreen \ src/WhateverGreen \
src/OpenCorePkg \ src/OpenCorePkg \
src/AppleSupportPkg \
src/VirtualSMC \ src/VirtualSMC \
src/OcBinaryData src/OcBinaryData
# Either DEBUG or RELEASE # Either DEBUG or RELEASE
OPENCORE_MODE=RELEASE OPENCORE_MODE=RELEASE
OPENCORE_UDK_BUILD_DIR=src/OpenCorePkg/UDK/Build/OpenCorePkg/$(OPENCORE_MODE)_XCODE5/X64
.DUMMY : all clean dist .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) all : $(SUBMODULES) $(EFI_FILES)
dist : OpenCore.dmg.gz OpenCoreEFIFolder.zip dist : $(SUBMODULES) OpenCore.dmg.gz OpenCoreEFIFolder.zip OpenCore.iso.gz
# Create OpenCore disk image: # Create OpenCore disk image:
@ -104,48 +107,44 @@ src/VirtualSMC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext
# OpenCore: # OpenCore:
EFI/OC/OpenCore.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenCore.efi EFI/OC/OpenCore.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi
cp -a $< $@ 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 mkdir -p EFI/OC/Drivers
cp -a $< $@ cp -a $< $@
EFI/BOOT/BOOTx64.efi : src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/BOOTx64.efi EFI/OC/Drivers/VBoxHfs.efi : $(OPENCORE_UDK_BUILD_DIR)/VBoxHfs.efi
mkdir -p EFI/OC/Drivers
cp -a $< $@
EFI/BOOT/BOOTx64.efi : $(OPENCORE_UDK_BUILD_DIR)/BOOTx64.efi
mkdir -p EFI/BOOT mkdir -p EFI/BOOT
cp -a $< $@ cp -a $< $@
src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenCore.efi src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/OpenRuntime.efi \ $(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi $(OPENCORE_UDK_BUILD_DIR)/OpenRuntime.efi \
src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/BOOTx64.efi src/OpenCorePkg/Binaries/$(OPENCORE_MODE)/Shell.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 \
: :
sed -i'.original' -e 's/^ARCHS=(X64 IA32)$$/ARCHS=(X64)/' src/OpenCorePkg/macbuild.tool cd src/OpenCorePkg && ARCHS=X64 ./build_oc.tool --skip-package $(OPENCORE_MODE)
cd src/OpenCorePkg && ./macbuild.tool --skip-package
# VBoxHfs:
EFI/OC/Drivers/VBoxHfs.efi : src/AppleSupportPkg/Binaries/RELEASE/VBoxHfs.efi
mkdir -p EFI/OC/Drivers
cp -a $< $@
src/AppleSupportPkg/Binaries/RELEASE/VBoxHfs.efi :
cd src/AppleSupportPkg && ./macbuild.tool --skip-package
# Tools # 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 mkdir -p EFI/OC/Tools
cp -a $< $@ 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 mkdir -p EFI/OC/Tools
cp -a $< $@ 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 mkdir -p EFI/OC/Drivers
cp -a $< $@ cp -a $< $@
EFI/OC/Resources : src/OcBinaryData/Resources EFI/OC/Resources : src/OcBinaryData/Resources
cp -a $< $@ cp -a $< EFI/OC/
# Fetch submodules: # Fetch submodules:
@ -156,4 +155,5 @@ EFI/BOOT/ EFI/OC/Drivers/ EFI/OC/Tools/ :
mkdir $@ mkdir $@
clean : 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)

1
src/AppleSupportPkg

@ -1 +0,0 @@
Subproject commit 45eed5556a8816b4c43a531794519c76b93a9683

2
src/OcBinaryData

@ -1 +1 @@
Subproject commit d457a7f3dfa71751a55099fe11b9ff620d63e13b Subproject commit 88bab6cf94655a0beaf82d279dbf5a5871e74612

2
src/OpenCorePkg

@ -1 +1 @@
Subproject commit d11b9f8ad358bf426e9ccef12260585cb7873404 Subproject commit 2f41d2abd1b2c71ae910163f63b8de1db1474e5b