From 98f4e4e814d553f292fe4cdec38e7a55a60eee06 Mon Sep 17 00:00:00 2001 From: Nicholas Sherlock Date: Fri, 7 Aug 2020 13:33:16 +1200 Subject: [PATCH] Update to latest master (OpenCore 0.6.0+) Now supports booting both Big Sur and Catalina --- .gitignore | 4 +- EFI/OC/config.plist | 97 ++++++++++++++++++++++++++++++++++++++++----- Makefile | 5 ++- src/AppleALC | 2 +- src/Lilu | 2 +- src/OcBinaryData | 2 +- src/OpenCorePkg | 2 +- src/VirtualSMC | 2 +- src/WhateverGreen | 2 +- 9 files changed, 99 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index dfe1023..de758ab 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,8 @@ EFI/OC/Tools/ResetSystem.efi EFI/OC/Resources EFI/OC/OpenCore.efi OpenCore-Image/ -OpenCore.dmg -OpenCore.dmg.gz +OpenCore.dmg* +OpenCore.iso* OpenCoreEFIFolder.zip # Prerequisites diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist index 45d9f70..4c17ed6 100644 --- a/EFI/OC/config.plist +++ b/EFI/OC/config.plist @@ -210,6 +210,8 @@ Add + Arch + x86_64 BundlePath Lilu.kext Comment @@ -221,11 +223,13 @@ MaxKernel MinKernel - + 12.0.0 PlistPath Contents/Info.plist + Arch + x86_64 BundlePath VirtualSMC.kext Comment @@ -237,11 +241,13 @@ MaxKernel MinKernel - + 12.0.0 PlistPath Contents/Info.plist + Arch + x86_64 BundlePath WhateverGreen.kext Comment @@ -253,11 +259,13 @@ MaxKernel MinKernel - + 12.0.0 PlistPath Contents/Info.plist + Arch + x86_64 BundlePath AppleALC.kext Comment @@ -269,7 +277,7 @@ MaxKernel MinKernel - + 12.0.0 PlistPath Contents/Info.plist @@ -306,10 +314,12 @@ Contents/Info.plist + Arch + x86_64 BundlePath MCEReporterDisabler.kext Comment - + AppleMCEReporter disabler Enabled ExecutablePath @@ -317,7 +327,7 @@ MaxKernel MinKernel - + 19.0.0 PlistPath Contents/Info.plist @@ -325,6 +335,8 @@ Block + Arch + Any Comment Enabled @@ -348,6 +360,29 @@ ////AAAAAAAAAAAAAAAAAA== + Force + + + Arch + Any + BundlePath + System/Library/Extensions/IONetworkingFamily.kext + Comment + Patch engine + Enabled + + Identifier + com.apple.iokit.IONetworkingFamily + ExecutablePath + Contents/MacOS/IONetworkingFamily + MaxKernel + 13.99.99 + MinKernel + + PlistPath + Contents/Info.plist + + Patch @@ -372,7 +407,7 @@ /wAA//8= MaxKernel - 19.99.99 + 20.99.99 MinKernel 17.0.0 Replace @@ -407,7 +442,7 @@ /////wAAAP///wA= MaxKernel - 19.99.99 + 20.99.99 MinKernel 17.0.0 Replace @@ -435,6 +470,8 @@ DisableIoMapper + DisableLinkeditJettison + DisableRtcChecksum DummyPowerManagement @@ -454,6 +491,15 @@ XhciPortLimit + Scheme + + FuzzyMatch + + KernelArch + x86_64 + KernelCache + Auto + Misc @@ -494,6 +540,8 @@ 0 DisplayLevel 2147483650 + SerialInit + SysReport Target @@ -507,16 +555,28 @@ AllowSetDefault + ApECID + 0 AuthRestart BootProtect None + DmgLoading + Signed + EnablePassword + ExposeSensitiveData 6 HaltLevel 2147483648 + PasswordHash + + PasswordSalt + ScanPolicy 18809603 + SecureBootModel + Disabled Vault Optional @@ -701,9 +761,20 @@ Drivers - OpenRuntime.efi VBoxHfs.efi + OpenRuntime.efi OpenCanopy.efi + #AudioDxe.efi + #OpenUsbKbDxe.efi + #UsbMouseDxe.efi + #Ps2KeyboardDxe.efi + #Ps2MouseDxe.efi + #HiiDatabase.efi + #NvmExpressDxe.efi + #XhciDxe.efi + #ExFatDxe.efi + #PartitionDxe.efi + #CrScreenshotDxe.efi Input @@ -748,6 +819,8 @@ TextRenderer BuiltinGraphics + UgaPassThrough + ProtocolOverrides @@ -759,12 +832,18 @@ AppleEvent + AppleFramebufferInfo + AppleImageConversion + AppleImg4Verification + AppleKeyMap AppleRtcRam + AppleSecureBoot + AppleSmcIo AppleUserInterfaceTheme diff --git a/Makefile b/Makefile index 97773f6..bca4a5b 100644 --- a/Makefile +++ b/Makefile @@ -101,6 +101,7 @@ EFI/OC/Kexts/VirtualSMC.kext : src/VirtualSMC/build/Release/VirtualSMC.kext src/VirtualSMC/build/Release/VirtualSMC.kext : src/VirtualSMC/Lilu.kext cd src/VirtualSMC && xcodebuild -configuration Release + touch $@ src/VirtualSMC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext ln -s ../Lilu/build/Debug/Lilu.kext $@ @@ -118,12 +119,12 @@ 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 +EFI/BOOT/BOOTx64.efi : $(OPENCORE_UDK_BUILD_DIR)/Bootstrap.efi mkdir -p EFI/BOOT cp -a $< $@ $(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)/Bootstrap.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 \ : diff --git a/src/AppleALC b/src/AppleALC index 7115d13..a567a8b 160000 --- a/src/AppleALC +++ b/src/AppleALC @@ -1 +1 @@ -Subproject commit 7115d13452c546b5c02aecd3b2813a6a597f9e08 +Subproject commit a567a8bd4bf983b2e8d77c9d62d90ba9bf7efa4c diff --git a/src/Lilu b/src/Lilu index 13c3cb9..b8eb26f 160000 --- a/src/Lilu +++ b/src/Lilu @@ -1 +1 @@ -Subproject commit 13c3cb95235a7d7b58cd7cb7a879b13b074c2693 +Subproject commit b8eb26fadc827d1df8f4e5ab8c9216c5098e8318 diff --git a/src/OcBinaryData b/src/OcBinaryData index d72b142..80b2448 160000 --- a/src/OcBinaryData +++ b/src/OcBinaryData @@ -1 +1 @@ -Subproject commit d72b142483ef6762044bba423ae64f40a1bf472a +Subproject commit 80b2448c7ebc31616d95bfcd60320dd0056ee0e5 diff --git a/src/OpenCorePkg b/src/OpenCorePkg index 32b4772..12fcf3e 160000 --- a/src/OpenCorePkg +++ b/src/OpenCorePkg @@ -1 +1 @@ -Subproject commit 32b4772c144be1d7fd80e75030836b60927646f3 +Subproject commit 12fcf3edf5198929a70f5558cf4ad0db7740156c diff --git a/src/VirtualSMC b/src/VirtualSMC index 9e86110..eda655b 160000 --- a/src/VirtualSMC +++ b/src/VirtualSMC @@ -1 +1 @@ -Subproject commit 9e86110827de10ae1a64a73c47505c18cd5ff022 +Subproject commit eda655bc5c21519cc7734ce7e6d1ae10a8d9b27d diff --git a/src/WhateverGreen b/src/WhateverGreen index 8ebb271..68b87f9 160000 --- a/src/WhateverGreen +++ b/src/WhateverGreen @@ -1 +1 @@ -Subproject commit 8ebb2716c6efa24ad8088166f1b4c768a2f73130 +Subproject commit 68b87f9ad3c8d45b48c543300603ba8022cb3ab9