Update OpenCore to 0.6.8

serial-debug
Nicholas Sherlock 3 years ago
parent f12337d379
commit ca04c24f32

3
.gitignore vendored

@ -1,8 +1,9 @@
# Files that will be built from source
EFI/BOOT/BOOTx64.efi
EFI/OC/Drivers/VBoxHfs.efi
EFI/OC/Drivers/OpenHfsPlus.efi
EFI/OC/Drivers/OpenRuntime.efi
EFI/OC/Drivers/OpenCanopy.efi
EFI/OC/Drivers/OpenPartitionDxe.efi
EFI/OC/Kexts/Lilu.kext
EFI/OC/Kexts/AppleALC.kext
EFI/OC/Kexts/WhateverGreen.kext

@ -73,6 +73,10 @@
<key>Patch</key>
<array>
<dict>
<key>Base</key>
<string></string>
<key>BaseSkip</key>
<integer>0</integer>
<key>Comment</key>
<string>_Q11 to XQ11</string>
<key>Count</key>
@ -99,6 +103,10 @@
<data></data>
</dict>
<dict>
<key>Base</key>
<string></string>
<key>BaseSkip</key>
<integer>0</integer>
<key>Comment</key>
<string>_Q12 to XQ12</string>
<key>Count</key>
@ -136,7 +144,7 @@
<key>ResetHwSig</key>
<false/>
<key>ResetLogoStatus</key>
<false/>
<true/>
</dict>
</dict>
<key>Booter</key>
@ -145,6 +153,8 @@
<array/>
<key>Quirks</key>
<dict>
<key>AllowRelocationBlock</key>
<false/>
<key>AvoidRuntimeDefrag</key>
<true/>
<key>DevirtualiseMmio</key>
@ -159,6 +169,8 @@
<true/>
<key>EnableWriteUnprotector</key>
<true/>
<key>ForceBooterSignature</key>
<false/>
<key>ForceExitBootServices</key>
<false/>
<key>ProtectMemoryRegions</key>
@ -198,12 +210,7 @@
</dict>
</dict>
<key>Delete</key>
<dict>
<key>PciRoot(0x0)/Pci(0x1b,0x0)</key>
<array>
<string>MaximumBootBeepVolume</string>
</array>
</dict>
<dict/>
</dict>
<key>Kernel</key>
<dict>
@ -223,7 +230,7 @@
<key>MaxKernel</key>
<string></string>
<key>MinKernel</key>
<string>12.0.0</string>
<string>10.0.0</string>
<key>PlistPath</key>
<string>Contents/Info.plist</string>
</dict>
@ -241,7 +248,7 @@
<key>MaxKernel</key>
<string></string>
<key>MinKernel</key>
<string>12.0.0</string>
<string>10.0.0</string>
<key>PlistPath</key>
<string>Contents/Info.plist</string>
</dict>
@ -351,8 +358,6 @@
</array>
<key>Emulate</key>
<dict>
<key>DummyPowerManagement</key>
<true/>
<key>Cpuid1Data</key>
<data>
VAYFAAAAAAAAAAAAAAAAAA==
@ -361,6 +366,8 @@
<data>
////AAAAAAAAAAAAAAAAAA==
</data>
<key>DummyPowerManagement</key>
<true/>
<key>MaxKernel</key>
<string></string>
<key>MinKernel</key>
@ -377,10 +384,10 @@
<string></string>
<key>Enabled</key>
<false/>
<key>Identifier</key>
<string>com.apple.iokit.IONetworkingFamily</string>
<key>ExecutablePath</key>
<string>Contents/MacOS/IONetworkingFamily</string>
<key>Identifier</key>
<string>com.apple.iokit.IONetworkingFamily</string>
<key>MaxKernel</key>
<string>13.99.99</string>
<key>MinKernel</key>
@ -392,6 +399,8 @@
<key>Patch</key>
<array>
<dict>
<key>Arch</key>
<string>Any</string>
<key>Base</key>
<string>_cpu_topology_sort</string>
<key>Comment</key>
@ -427,6 +436,8 @@
<integer>0</integer>
</dict>
<dict>
<key>Arch</key>
<string>Any</string>
<key>Base</key>
<string></string>
<key>Comment</key>
@ -496,6 +507,8 @@
<false/>
<key>PowerTimeoutKernelPanic</key>
<false/>
<key>SetApfsTrimTimeout</key>
<integer>-1</integer>
<key>ThirdPartyDrives</key>
<false/>
<key>XhciPortLimit</key>
@ -523,12 +536,18 @@
<string>Auto</string>
<key>HideAuxiliary</key>
<false/>
<key>LauncherOption</key>
<string>Disabled</string>
<key>LauncherPath</key>
<string>Default</string>
<key>PickerAttributes</key>
<integer>1</integer>
<integer>17</integer>
<key>PickerAudioAssist</key>
<false/>
<key>PickerMode</key>
<string>External</string>
<key>PickerVariant</key>
<string>Auto</string>
<key>PollAppleHotKeys</key>
<true/>
<key>ShowPicker</key>
@ -571,8 +590,6 @@
<false/>
<key>BlacklistAppleUpdate</key>
<true/>
<key>BootProtect</key>
<string>None</string>
<key>DmgLoading</key>
<string>Signed</string>
<key>EnablePassword</key>
@ -672,12 +689,12 @@
<data>Rg==</data>
<key>boot-args</key>
<string>keepsyms=1</string>
<key>run-efi-updater</key>
<string>No</string>
<key>csr-active-config</key>
<data>AAAAAA==</data>
<key>prev-lang:kbd</key>
<data>ZW4tVVM6MA==</data>
<key>run-efi-updater</key>
<string>No</string>
</dict>
</dict>
<key>Delete</key>
@ -741,8 +758,8 @@
<dict>
<key>AdviseWindows</key>
<false/>
<key>SystemMemoryStatus</key>
<string>Auto</string>
<key>MaxBIOSVersion</key>
<false/>
<key>MLB</key>
<string>C02717306J9JG361M</string>
<key>ProcessorType</key>
@ -751,6 +768,8 @@
<data>m7zhIYfl</data>
<key>SpoofVendor</key>
<true/>
<key>SystemMemoryStatus</key>
<string>Auto</string>
<key>SystemProductName</key>
<string>iMacPro1,1</string>
<key>SystemSerialNumber</key>
@ -766,6 +785,8 @@
<true/>
<key>UpdateSMBIOSMode</key>
<string>Create</string>
<key>UseRawUuidEncoding</key>
<false/>
</dict>
<key>UEFI</key>
<dict>
@ -784,6 +805,21 @@
<key>MinVersion</key>
<integer>-1</integer>
</dict>
<key>AppleInput</key>
<dict>
<key>AppleEvent</key>
<string>Builtin</string>
<key>CustomDelays</key>
<string>Auto</string>
<key>KeyInitialDelay</key>
<integer>0</integer>
<key>KeySubsequentDelay</key>
<integer>5</integer>
<key>PointerSpeedDiv</key>
<integer>1</integer>
<key>PointerSpeedMul</key>
<integer>1</integer>
</dict>
<key>Audio</key>
<dict>
<key>AudioCodec</key>
@ -797,7 +833,11 @@
<key>MinimumVolume</key>
<integer>20</integer>
<key>PlayChime</key>
<string>Auto</string>
<key>ResetTrafficClass</key>
<false/>
<key>SetupDelay</key>
<integer>0</integer>
<key>VolumeAmplifier</key>
<integer>0</integer>
</dict>
@ -805,10 +845,11 @@
<true/>
<key>Drivers</key>
<array>
<string>VBoxHfs.efi</string>
<string>OpenHfsPlus.efi</string>
<string>OpenRuntime.efi</string>
<string>OpenCanopy.efi</string>
<string>#AudioDxe.efi</string>
<string>OpenPartitionDxe.efi</string>
<string>#OpenUsbKbDxe.efi</string>
<string>#UsbMouseDxe.efi</string>
<string>#Ps2KeyboardDxe.efi</string>
@ -817,7 +858,6 @@
<string>#NvmExpressDxe.efi</string>
<string>#XhciDxe.efi</string>
<string>#ExFatDxe.efi</string>
<string>#PartitionDxe.efi</string>
<string>#CrScreenshotDxe.efi</string>
</array>
<key>Input</key>
@ -826,8 +866,6 @@
<false/>
<key>KeyForgetThreshold</key>
<integer>5</integer>
<key>KeyMergeThreshold</key>
<integer>2</integer>
<key>KeySupport</key>
<true/>
<key>KeySupportMode</key>
@ -851,6 +889,8 @@
<false/>
<key>ForceResolution</key>
<false/>
<key>GopPassThrough</key>
<false/>
<key>IgnoreTextInGraphics</key>
<false/>
<key>ProvideConsoleGop</key>
@ -876,8 +916,6 @@
<false/>
<key>AppleDebugLog</key>
<false/>
<key>AppleEvent</key>
<false/>
<key>AppleFramebufferInfo</key>
<false/>
<key>AppleImageConversion</key>
@ -899,7 +937,7 @@
<key>DeviceProperties</key>
<false/>
<key>FirmwareVolume</key>
<false/>
<true/>
<key>HashServices</key>
<false/>
<key>OSInfo</key>
@ -909,8 +947,10 @@
</dict>
<key>Quirks</key>
<dict>
<key>DeduplicateBootOrder</key>
<true/>
<key>ActivateHpetSupport</key>
<false/>
<key>DisableSecurityPolicy</key>
<false/>
<key>ExitBootServicesDelay</key>
<integer>0</integer>
<key>IgnoreInvalidFlexRatio</key>

@ -5,9 +5,10 @@ KEXTS= \
EFI/OC/Kexts/VirtualSMC.kext
DRIVERS= \
EFI/OC/Drivers/VBoxHfs.efi \
EFI/OC/Drivers/OpenHfsPlus.efi \
EFI/OC/Drivers/OpenRuntime.efi \
EFI/OC/Drivers/OpenCanopy.efi
EFI/OC/Drivers/OpenCanopy.efi \
EFI/OC/Drivers/OpenPartitionDxe.efi
TOOLS = \
EFI/OC/Tools/Shell.efi \
@ -51,7 +52,7 @@ OpenCore-$(RELEASE_VERSION).dmg : Makefile $(EFI_FILES)
rm -f $@
hdiutil create -layout GPTSPUD -partitionType EFI -fs "FAT32" -megabytes 150 -volname EFI $@
mkdir -p OpenCore-Image
DEV_NAME=$$(hdiutil attach -nomount -plist $@ | xpath "/plist/dict/array/dict/key[text()='content-hint']/following-sibling::string[1][text()='EFI']/../key[text()='dev-entry']/following-sibling::string[1]/text()" 2> /dev/null) && \
DEV_NAME=$$(hdiutil attach -nomount -plist $@ | xpath -e "/plist/dict/array/dict/key[text()='content-hint']/following-sibling::string[1][text()='EFI']/../key[text()='dev-entry']/following-sibling::string[1]/text()" 2> /dev/null) && \
mount -tmsdos "$$DEV_NAME" OpenCore-Image
cp -a EFI OpenCore-Image/
hdiutil detach -force OpenCore-Image
@ -119,13 +120,10 @@ src/VirtualSMC/MacKernelSDK : src/MacKernelSDK
EFI/OC/OpenCore.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi
cp -a $< $@
EFI/OC/Drivers/OpenRuntime.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenRuntime.efi
EFI/OC/Drivers/OpenRuntime.efi EFI/OC/Drivers/OpenHfsPlus.efi EFI/OC/Drivers/OpenPartitionDxe.efi \
: $(OPENCORE_UDK_BUILD_DIR)/OpenRuntime.efi $(OPENCORE_UDK_BUILD_DIR)/OpenHfsPlus.efi $(OPENCORE_UDK_BUILD_DIR)/OpenPartitionDxe.efi
mkdir -p EFI/OC/Drivers
cp -a $< $@
EFI/OC/Drivers/VBoxHfs.efi : $(OPENCORE_UDK_BUILD_DIR)/VBoxHfs.efi
mkdir -p EFI/OC/Drivers
cp -a $< $@
cp -a $? EFI/OC/Drivers/
EFI/BOOT/BOOTx64.efi : $(OPENCORE_UDK_BUILD_DIR)/Bootstrap.efi
mkdir -p EFI/BOOT
@ -134,9 +132,8 @@ EFI/BOOT/BOOTx64.efi : $(OPENCORE_UDK_BUILD_DIR)/Bootstrap.efi
$(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi $(OPENCORE_UDK_BUILD_DIR)/OpenRuntime.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 \
$(OPENCORE_UDK_BUILD_DIR)/OpenHfsPlus.efi $(OPENCORE_UDK_BUILD_DIR)/OpenPartitionDxe.efi \
:
cd src/OpenCorePkg && patch -p1 --forward < ../0001-vboxhfs.patch || true
cd src/OpenCorePkg && ARCHS=X64 ./build_oc.tool --skip-package $(OPENCORE_MODE)
# Tools

@ -1,27 +0,0 @@
diff --git a/Staging/VBoxHfs/fsw_hfs.c b/Staging/VBoxHfs/fsw_hfs.c
index a5b3565d..9ca3d0f1 100644
--- a/Staging/VBoxHfs/fsw_hfs.c
+++ b/Staging/VBoxHfs/fsw_hfs.c
@@ -1042,20 +1042,20 @@ fsw_hfs_cmpf_catkey (BTreeKey *btkey1, BTreeKey *btkey2)
for (ac = 0; ac == 0 && apos < ckey1nlen; apos++) {
ac = be16_to_cpu (p1[apos]);
- ac = fsw_to_lower (ac);
+ ac = ac ? fsw_to_lower (ac) : 0xFFFF;
}
/* get next valid character from ckey2 */
for (bc = 0; bc == 0 && bpos < ckey2nlen; bpos++) {
bc = p2[bpos];
- bc = fsw_to_lower (bc);
+ bc = bc ? fsw_to_lower (bc) : 0xFFFF;
}
if (ac != bc)
break;
- if (ac == 0)
+ if (bpos == ckey1nlen)
return 0;
}

@ -1 +1 @@
Subproject commit 5d49bac43eef8f855adfefb26ed364ea1e11c008
Subproject commit 3c2f6315e6aed0cc3c45a9f01f84ef42fb497044

@ -1 +1 @@
Subproject commit 575bd85c759fcec66c02a0ab960b5d8dad095c69
Subproject commit 5aeba9f98106a5a8a3057712b74e1608faf5e276

@ -1 +1 @@
Subproject commit e0733fae0317161220150b20de9a122ce59235f1
Subproject commit 2b584e8e2081ed22fc619151518921c8636d4639

@ -1 +1 @@
Subproject commit fc76b32b348ea18a00fe796da419a1eb36fe486b
Subproject commit ccf3d0c36784100293ccfb2865e10cd37f7a78ee

@ -1 +1 @@
Subproject commit e8cc05f5c394ee35512fb5f53132b02f8f1018f0
Subproject commit 5cd223f03dd555c2ad0c6f45181808a5105bb605

@ -1 +1 @@
Subproject commit 3a8366d9a4da5fa827d0eca0e7a9e83e1a97ddd8
Subproject commit 2a7455daf65c356c867a1d65b8f2520ae575ee3e
Loading…
Cancel
Save