diff --git a/.gitignore b/.gitignore
index de758ab..0b7b27d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index d108dda..6cfd258 100644
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -73,6 +73,10 @@
Patch
+ Base
+
+ BaseSkip
+ 0
Comment
_Q11 to XQ11
Count
@@ -99,6 +103,10 @@
+ Base
+
+ BaseSkip
+ 0
Comment
_Q12 to XQ12
Count
@@ -136,7 +144,7 @@
ResetHwSig
ResetLogoStatus
-
+
Booter
@@ -145,6 +153,8 @@
Quirks
+ AllowRelocationBlock
+
AvoidRuntimeDefrag
DevirtualiseMmio
@@ -159,6 +169,8 @@
EnableWriteUnprotector
+ ForceBooterSignature
+
ForceExitBootServices
ProtectMemoryRegions
@@ -198,12 +210,7 @@
Delete
-
- PciRoot(0x0)/Pci(0x1b,0x0)
-
- MaximumBootBeepVolume
-
-
+
Kernel
@@ -223,7 +230,7 @@
MaxKernel
MinKernel
- 12.0.0
+ 10.0.0
PlistPath
Contents/Info.plist
@@ -241,7 +248,7 @@
MaxKernel
MinKernel
- 12.0.0
+ 10.0.0
PlistPath
Contents/Info.plist
@@ -351,8 +358,6 @@
Emulate
- DummyPowerManagement
-
Cpuid1Data
VAYFAAAAAAAAAAAAAAAAAA==
@@ -361,6 +366,8 @@
////AAAAAAAAAAAAAAAAAA==
+ DummyPowerManagement
+
MaxKernel
MinKernel
@@ -377,10 +384,10 @@
Enabled
- Identifier
- com.apple.iokit.IONetworkingFamily
ExecutablePath
Contents/MacOS/IONetworkingFamily
+ Identifier
+ com.apple.iokit.IONetworkingFamily
MaxKernel
13.99.99
MinKernel
@@ -392,6 +399,8 @@
Patch
+ Arch
+ Any
Base
_cpu_topology_sort
Comment
@@ -427,6 +436,8 @@
0
+ Arch
+ Any
Base
Comment
@@ -496,6 +507,8 @@
PowerTimeoutKernelPanic
+ SetApfsTrimTimeout
+ -1
ThirdPartyDrives
XhciPortLimit
@@ -523,12 +536,18 @@
Auto
HideAuxiliary
+ LauncherOption
+ Disabled
+ LauncherPath
+ Default
PickerAttributes
- 1
+ 17
PickerAudioAssist
PickerMode
External
+ PickerVariant
+ Auto
PollAppleHotKeys
ShowPicker
@@ -571,8 +590,6 @@
BlacklistAppleUpdate
- BootProtect
- None
DmgLoading
Signed
EnablePassword
@@ -672,12 +689,12 @@
Rg==
boot-args
keepsyms=1
- run-efi-updater
- No
csr-active-config
AAAAAA==
prev-lang:kbd
ZW4tVVM6MA==
+ run-efi-updater
+ No
Delete
@@ -741,8 +758,8 @@
AdviseWindows
- SystemMemoryStatus
- Auto
+ MaxBIOSVersion
+
MLB
C02717306J9JG361M
ProcessorType
@@ -751,6 +768,8 @@
m7zhIYfl
SpoofVendor
+ SystemMemoryStatus
+ Auto
SystemProductName
iMacPro1,1
SystemSerialNumber
@@ -766,6 +785,8 @@
UpdateSMBIOSMode
Create
+ UseRawUuidEncoding
+
UEFI
@@ -784,6 +805,21 @@
MinVersion
-1
+ AppleInput
+
+ AppleEvent
+ Builtin
+ CustomDelays
+ Auto
+ KeyInitialDelay
+ 0
+ KeySubsequentDelay
+ 5
+ PointerSpeedDiv
+ 1
+ PointerSpeedMul
+ 1
+
Audio
AudioCodec
@@ -797,7 +833,11 @@
MinimumVolume
20
PlayChime
+ Auto
+ ResetTrafficClass
+ SetupDelay
+ 0
VolumeAmplifier
0
@@ -805,10 +845,11 @@
Drivers
- VBoxHfs.efi
+ OpenHfsPlus.efi
OpenRuntime.efi
OpenCanopy.efi
#AudioDxe.efi
+ OpenPartitionDxe.efi
#OpenUsbKbDxe.efi
#UsbMouseDxe.efi
#Ps2KeyboardDxe.efi
@@ -817,7 +858,6 @@
#NvmExpressDxe.efi
#XhciDxe.efi
#ExFatDxe.efi
- #PartitionDxe.efi
#CrScreenshotDxe.efi
Input
@@ -826,8 +866,6 @@
KeyForgetThreshold
5
- KeyMergeThreshold
- 2
KeySupport
KeySupportMode
@@ -851,6 +889,8 @@
ForceResolution
+ GopPassThrough
+
IgnoreTextInGraphics
ProvideConsoleGop
@@ -876,8 +916,6 @@
AppleDebugLog
- AppleEvent
-
AppleFramebufferInfo
AppleImageConversion
@@ -899,7 +937,7 @@
DeviceProperties
FirmwareVolume
-
+
HashServices
OSInfo
@@ -909,8 +947,10 @@
Quirks
- DeduplicateBootOrder
-
+ ActivateHpetSupport
+
+ DisableSecurityPolicy
+
ExitBootServicesDelay
0
IgnoreInvalidFlexRatio
diff --git a/Makefile b/Makefile
index 0271498..2e2a397 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/src/0001-vboxhfs.patch b/src/0001-vboxhfs.patch
deleted file mode 100644
index fc5fc30..0000000
--- a/src/0001-vboxhfs.patch
+++ /dev/null
@@ -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;
- }
diff --git a/src/AppleALC b/src/AppleALC
index 5d49bac..3c2f631 160000
--- a/src/AppleALC
+++ b/src/AppleALC
@@ -1 +1 @@
-Subproject commit 5d49bac43eef8f855adfefb26ed364ea1e11c008
+Subproject commit 3c2f6315e6aed0cc3c45a9f01f84ef42fb497044
diff --git a/src/Lilu b/src/Lilu
index 575bd85..5aeba9f 160000
--- a/src/Lilu
+++ b/src/Lilu
@@ -1 +1 @@
-Subproject commit 575bd85c759fcec66c02a0ab960b5d8dad095c69
+Subproject commit 5aeba9f98106a5a8a3057712b74e1608faf5e276
diff --git a/src/MacKernelSDK b/src/MacKernelSDK
index e0733fa..2b584e8 160000
--- a/src/MacKernelSDK
+++ b/src/MacKernelSDK
@@ -1 +1 @@
-Subproject commit e0733fae0317161220150b20de9a122ce59235f1
+Subproject commit 2b584e8e2081ed22fc619151518921c8636d4639
diff --git a/src/OcBinaryData b/src/OcBinaryData
index fc76b32..ccf3d0c 160000
--- a/src/OcBinaryData
+++ b/src/OcBinaryData
@@ -1 +1 @@
-Subproject commit fc76b32b348ea18a00fe796da419a1eb36fe486b
+Subproject commit ccf3d0c36784100293ccfb2865e10cd37f7a78ee
diff --git a/src/OpenCorePkg b/src/OpenCorePkg
index e8cc05f..5cd223f 160000
--- a/src/OpenCorePkg
+++ b/src/OpenCorePkg
@@ -1 +1 @@
-Subproject commit e8cc05f5c394ee35512fb5f53132b02f8f1018f0
+Subproject commit 5cd223f03dd555c2ad0c6f45181808a5105bb605
diff --git a/src/VirtualSMC b/src/VirtualSMC
index 3a8366d..2a7455d 160000
--- a/src/VirtualSMC
+++ b/src/VirtualSMC
@@ -1 +1 @@
-Subproject commit 3a8366d9a4da5fa827d0eca0e7a9e83e1a97ddd8
+Subproject commit 2a7455daf65c356c867a1d65b8f2520ae575ee3e