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

Fix inability to boot Catalina by reverting VBoxHFS commit 28e2749404

Browse Source
This commit is contained in:
Nicholas Sherlock 2020-10-19 23:33:59 +13:00
parent 541411f97f
commit 534b42b0f9
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -136,6 +136,7 @@ $(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)/ResetSystem.efi $(OPENCORE_UDK_BUILD_DIR)/OpenCanopy.efi \
$(OPENCORE_UDK_BUILD_DIR)/VBoxHfs.efi \ $(OPENCORE_UDK_BUILD_DIR)/VBoxHfs.efi \
: :
cd src/OpenCorePkg && patch -p1 --forward < ../0001-vboxhfs.patch || true
cd src/OpenCorePkg && ARCHS=X64 ./build_oc.tool --skip-package $(OPENCORE_MODE) cd src/OpenCorePkg && ARCHS=X64 ./build_oc.tool --skip-package $(OPENCORE_MODE)
# Tools # Tools

27
src/0001-vboxhfs.patch Normal file
View File

@ -0,0 +1,27 @@
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;
}