diff --git a/CREDITS.md b/CREDITS.md
index 27da7d0..e63ec96 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2,6 +2,8 @@
- [UPSTREAM] https://github.com/acidanthera/OpenCorePkg + https://dortania.github.io/ - for making all this possible!
+- [UPSTREAM] https://github.com/thenickdude/KVM-Opencore - Thanks Nick!
+
* RehabMan, th3joker and others - FakeSMC.kext, https://bitbucket.org/RehabMan
* Chuck Remes (chuckremes) - better documentation
@@ -122,4 +124,8 @@
- Kian Kasad (kdkasad) - Use grep instead of egrep
+- https://github.com/cclauss - Typo fix
+
+- https://github.com/thiagokokada - Makefile to improve usability
+
Note: Individual files have more specific 'credits' in them.
diff --git a/Makefile b/Makefile
index 0cf0f0e..ad64cb0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,15 @@
+DISK_SIZE := 128G
+
+all: BaseSystem.img mac_hdd_ng.img
+
+BaseSystem.img: BaseSystem.dmg
+ qemu-img convert BaseSystem.dmg -O raw BaseSystem.img
+
+BaseSystem.dmg:
+ ./fetch-macOS-v2.py
+
+mac_hdd_ng.img:
+ qemu-img create -f qcow2 mac_hdd_ng.img ${DISK_SIZE}
+
clean:
- rm -rf content || true
+ rm -rf BaseSystem{.dmg,.img,.chunklist}
diff --git a/OVMF-notes.txt b/OVMF-notes.txt
index e8549e4..6716040 100644
--- a/OVMF-notes.txt
+++ b/OVMF-notes.txt
@@ -1,6 +1,6 @@
Current OVMF blobs are borrowed from the following URL(s),
-- http://ftp.debian.org/debian/pool/main/e/edk2/ (ovmf_2021.08-1_all.deb)
+- http://ftp.debian.org/debian/pool/main/e/edk2/ (ovmf_2021.08-2_all.deb)
Building OVMF
-------------
diff --git a/OpenCore-Boot-CD.sh b/OpenCore-Boot-CD.sh
index 029ca8d..9a0a2b7 100755
--- a/OpenCore-Boot-CD.sh
+++ b/OpenCore-Boot-CD.sh
@@ -42,7 +42,7 @@ args=(
-smbios type=2
-device ich9-intel-hda -device hda-duplex
-device ich9-ahci,id=sata
- -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore-Catalina/OpenCore.qcow2"
+ -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore/OpenCore.qcow2"
-device ide-hd,bus=sata.2,drive=OpenCoreBoot
-device ide-hd,bus=sata.3,drive=InstallMedia
-drive id=InstallMedia,if=none,file="$REPO_PATH/os.dmg",format=raw
diff --git a/OpenCore-Boot.sh b/OpenCore-Boot.sh
index 48739a9..db82e71 100755
--- a/OpenCore-Boot.sh
+++ b/OpenCore-Boot.sh
@@ -40,12 +40,12 @@ args=(
# -device usb-mouse,bus=ehci.0
# -device nec-usb-xhci,id=xhci
-device isa-applesmc,osk="ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc"
- -drive if=pflash,format=raw,readonly,file="$REPO_PATH/$OVMF_DIR/OVMF_CODE.fd"
+ -drive if=pflash,format=raw,readonly=true,file="$REPO_PATH/$OVMF_DIR/OVMF_CODE.fd"
-drive if=pflash,format=raw,file="$REPO_PATH/$OVMF_DIR/OVMF_VARS-1024x768.fd"
-smbios type=2
-device ich9-intel-hda -device hda-duplex
-device ich9-ahci,id=sata
- -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore-Catalina/OpenCore.qcow2"
+ -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore/OpenCore.qcow2"
-device ide-hd,bus=sata.2,drive=OpenCoreBoot
-device ide-hd,bus=sata.3,drive=InstallMedia
-drive id=InstallMedia,if=none,file="$REPO_PATH/BaseSystem.img",format=raw
diff --git a/OpenCore-Catalina/EFI/BOOT/BOOTx64.efi b/OpenCore-Catalina/EFI/BOOT/BOOTx64.efi
deleted file mode 100644
index ecddd5e..0000000
Binary files a/OpenCore-Catalina/EFI/BOOT/BOOTx64.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/AudioDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/AudioDxe.efi
deleted file mode 100644
index d1265d8..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/AudioDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/CrScreenshotDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/CrScreenshotDxe.efi
deleted file mode 100644
index 06bb1b0..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/CrScreenshotDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/HiiDatabase.efi b/OpenCore-Catalina/EFI/OC/Drivers/HiiDatabase.efi
deleted file mode 100644
index b51af37..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/HiiDatabase.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/NvmExpressDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/NvmExpressDxe.efi
deleted file mode 100644
index 5e847e4..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/NvmExpressDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/OpenCanopy.efi b/OpenCore-Catalina/EFI/OC/Drivers/OpenCanopy.efi
deleted file mode 100644
index af3b0ac..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/OpenCanopy.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/OpenHfsPlus.efi b/OpenCore-Catalina/EFI/OC/Drivers/OpenHfsPlus.efi
deleted file mode 100644
index 3d0ab75..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/OpenHfsPlus.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/OpenPartitionDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/OpenPartitionDxe.efi
deleted file mode 100644
index 8c89fec..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/OpenPartitionDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/OpenRuntime.efi b/OpenCore-Catalina/EFI/OC/Drivers/OpenRuntime.efi
deleted file mode 100644
index f235eab..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/OpenRuntime.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/OpenUsbKbDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/OpenUsbKbDxe.efi
deleted file mode 100644
index e46548a..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/OpenUsbKbDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/Ps2KeyboardDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/Ps2KeyboardDxe.efi
deleted file mode 100644
index 4626163..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/Ps2KeyboardDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/Ps2MouseDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/Ps2MouseDxe.efi
deleted file mode 100644
index 01119b6..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/Ps2MouseDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/UsbMouseDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/UsbMouseDxe.efi
deleted file mode 100644
index 1e4f157..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/UsbMouseDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/XhciDxe.efi b/OpenCore-Catalina/EFI/OC/Drivers/XhciDxe.efi
deleted file mode 100644
index 049cc08..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Drivers/XhciDxe.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu b/OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu
deleted file mode 100755
index 4eca581..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC b/OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC
deleted file mode 100755
index ed836ee..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/Info.plist b/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/Info.plist
deleted file mode 100644
index d612189..0000000
--- a/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/Info.plist
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
- BuildMachineOSBuild
- 15G31
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- VoodooHDA
- CFBundleIdentifier
- org.voodoo.driver.VoodooHDA
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- VoodooHDA
- CFBundlePackageType
- KEXT
- CFBundleShortVersionString
- 2.9.2
- CFBundleSignature
- ????
- CFBundleSupportedPlatforms
-
- MacOSX
-
- CFBundleVersion
- 2.9.2
- DTCompiler
- com.apple.compilers.llvm.clang.1_0
- DTPlatformBuild
- 7D1014
- DTPlatformVersion
- GM
- DTSDKBuild
- 15E60
- DTSDKName
- macosx10.11
- DTXcode
- 0731
- DTXcodeBuild
- 7D1014
- IOKitPersonalities
-
- VoodooHDA
-
- AllowMSI
-
- Boost
- 1
- CFBundleIdentifier
- org.voodoo.driver.VoodooHDA
- DisableInputMonitor
-
- IOClass
- VoodooHDADevice
- IOMatchCategory
- VoodooHDADevice
- IOPCIClassMatch
- 0x04020000&0xfffe0000
- IOProviderClass
- IOPCIDevice
- IOUserClientClass
- VoodooHDAUserClient
- InhibitCache
-
- MixerValues
-
- PCM
- 100
- Rec
- 90
- iGain
- 90
- iMix
- 100
-
- NodesToPatch
-
-
- Caps
- 0x373e
- Codec
- 4
- Comment
- Example of possible values
- Config
- 0x90a70120
- Conns
- 12,13,24
- Control
- 20
- DAC
- 2
- Enable
- 1
- Node
- 12
- Select
- 13
- SwitchCh
- 0
- Type
- 4
-
-
- Codec
- 2
- Comment
- To disable back sound on ALC codec set enable=0
- Enable
- 1
- Node
- 11
-
-
- Noise
- 0
- Vectorize
-
- VoodooHDAEnableHalfMicVolumeFix
-
- VoodooHDAEnableHalfVolumeFix
-
- VoodooHDAEnableMuteFix
-
- VoodooHDAEnableVolumeChangeFix
-
- VoodooHDAVerboseLevel
- 0
-
-
- OSBundleLibraries
-
- com.apple.iokit.IOAudioFamily
- 1.1fc9
- com.apple.iokit.IOPCIFamily
- 2.1
- com.apple.kpi.iokit
- 9.0.0
- com.apple.kpi.libkern
- 9.0.0
- com.apple.kpi.mach
- 9.0.0
- com.apple.kpi.unsupported
- 9.0.0
-
-
-
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/MacOS/VoodooHDA b/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/MacOS/VoodooHDA
deleted file mode 100755
index 354fbc7..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/MacOS/VoodooHDA and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/_CodeSignature/CodeResources b/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/_CodeSignature/CodeResources
deleted file mode 100644
index 0710b40..0000000
--- a/OpenCore-Catalina/EFI/OC/Kexts/VoodooHDA.kext/Contents/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
- files
-
- files2
-
- rules
-
- ^Resources/
-
- ^Resources/.*\.lproj/
-
- optional
-
- weight
- 1000
-
- ^Resources/.*\.lproj/locversion.plist$
-
- omit
-
- weight
- 1100
-
- ^version.plist$
-
-
- rules2
-
- .*\.dSYM($|/)
-
- weight
- 11
-
- ^(.*/)?\.DS_Store$
-
- omit
-
- weight
- 2000
-
- ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/
-
- nested
-
- weight
- 10
-
- ^.*
-
- ^Info\.plist$
-
- omit
-
- weight
- 20
-
- ^PkgInfo$
-
- omit
-
- weight
- 20
-
- ^Resources/
-
- weight
- 20
-
- ^Resources/.*\.lproj/
-
- optional
-
- weight
- 1000
-
- ^Resources/.*\.lproj/locversion.plist$
-
- omit
-
- weight
- 1100
-
- ^[^/]+$
-
- nested
-
- weight
- 10
-
- ^embedded\.provisionprofile$
-
- weight
- 20
-
- ^version\.plist$
-
- weight
- 20
-
-
-
-
diff --git a/OpenCore-Catalina/EFI/OC/OpenCore.efi b/OpenCore-Catalina/EFI/OC/OpenCore.efi
deleted file mode 100644
index 88e8308..0000000
Binary files a/OpenCore-Catalina/EFI/OC/OpenCore.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/BootKicker.efi b/OpenCore-Catalina/EFI/OC/Tools/BootKicker.efi
deleted file mode 100644
index f1e3d5d..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/BootKicker.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/ChipTune.efi b/OpenCore-Catalina/EFI/OC/Tools/ChipTune.efi
deleted file mode 100644
index b16ce19..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/ChipTune.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/CleanNvram.efi b/OpenCore-Catalina/EFI/OC/Tools/CleanNvram.efi
deleted file mode 100644
index 3eaa7a2..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/CleanNvram.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/GopStop.efi b/OpenCore-Catalina/EFI/OC/Tools/GopStop.efi
deleted file mode 100644
index ad4a9d1..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/GopStop.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/OpenControl.efi b/OpenCore-Catalina/EFI/OC/Tools/OpenControl.efi
deleted file mode 100644
index 49a56a3..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/OpenControl.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/OpenShell.efi b/OpenCore-Catalina/EFI/OC/Tools/OpenShell.efi
deleted file mode 100644
index 1bebba1..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/OpenShell.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/ResetSystem.efi b/OpenCore-Catalina/EFI/OC/Tools/ResetSystem.efi
deleted file mode 100644
index 15f7dfe..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/ResetSystem.efi and /dev/null differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/RtcRw.efi b/OpenCore-Catalina/EFI/OC/Tools/RtcRw.efi
deleted file mode 100644
index 9080e19..0000000
Binary files a/OpenCore-Catalina/EFI/OC/Tools/RtcRw.efi and /dev/null differ
diff --git a/OpenCore/EFI/BOOT/.contentFlavour b/OpenCore/EFI/BOOT/.contentFlavour
new file mode 100644
index 0000000..8b66bff
--- /dev/null
+++ b/OpenCore/EFI/BOOT/.contentFlavour
@@ -0,0 +1 @@
+OpenCore
\ No newline at end of file
diff --git a/OpenCore/EFI/BOOT/BOOTx64.efi b/OpenCore/EFI/BOOT/BOOTx64.efi
new file mode 100644
index 0000000..6d6f58a
Binary files /dev/null and b/OpenCore/EFI/BOOT/BOOTx64.efi differ
diff --git a/OpenCore/EFI/OC/.contentFlavour b/OpenCore/EFI/OC/.contentFlavour
new file mode 100644
index 0000000..8b66bff
--- /dev/null
+++ b/OpenCore/EFI/OC/.contentFlavour
@@ -0,0 +1 @@
+OpenCore
\ No newline at end of file
diff --git a/OpenCore-Catalina/EFI/OC/ACPI/SSDT-DTGP.aml b/OpenCore/EFI/OC/ACPI/SSDT-DTGP.aml
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/ACPI/SSDT-DTGP.aml
rename to OpenCore/EFI/OC/ACPI/SSDT-DTGP.aml
diff --git a/OpenCore-Catalina/EFI/OC/ACPI/SSDT-EC.aml b/OpenCore/EFI/OC/ACPI/SSDT-EC.aml
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/ACPI/SSDT-EC.aml
rename to OpenCore/EFI/OC/ACPI/SSDT-EC.aml
diff --git a/OpenCore-Catalina/EFI/OC/ACPI/SSDT-EHCI.aml b/OpenCore/EFI/OC/ACPI/SSDT-EHCI.aml
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/ACPI/SSDT-EHCI.aml
rename to OpenCore/EFI/OC/ACPI/SSDT-EHCI.aml
diff --git a/OpenCore-Catalina/EFI/OC/ACPI/SSDT-PLUG.aml b/OpenCore/EFI/OC/ACPI/SSDT-PLUG.aml
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/ACPI/SSDT-PLUG.aml
rename to OpenCore/EFI/OC/ACPI/SSDT-PLUG.aml
diff --git a/OpenCore/EFI/OC/Drivers/AudioDxe.efi b/OpenCore/EFI/OC/Drivers/AudioDxe.efi
new file mode 100644
index 0000000..eed5957
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/AudioDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/CrScreenshotDxe.efi b/OpenCore/EFI/OC/Drivers/CrScreenshotDxe.efi
new file mode 100644
index 0000000..9009b40
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/CrScreenshotDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/HiiDatabase.efi b/OpenCore/EFI/OC/Drivers/HiiDatabase.efi
new file mode 100644
index 0000000..eb1014c
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/HiiDatabase.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/NvmExpressDxe.efi b/OpenCore/EFI/OC/Drivers/NvmExpressDxe.efi
new file mode 100644
index 0000000..8ec538d
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/NvmExpressDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/OpenCanopy.efi b/OpenCore/EFI/OC/Drivers/OpenCanopy.efi
new file mode 100644
index 0000000..94c3266
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/OpenCanopy.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/OpenHfsPlus.efi b/OpenCore/EFI/OC/Drivers/OpenHfsPlus.efi
new file mode 100644
index 0000000..807cb9c
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/OpenHfsPlus.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/OpenLinuxBoot.efi b/OpenCore/EFI/OC/Drivers/OpenLinuxBoot.efi
new file mode 100644
index 0000000..a0cf702
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/OpenLinuxBoot.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/OpenPartitionDxe.efi b/OpenCore/EFI/OC/Drivers/OpenPartitionDxe.efi
new file mode 100644
index 0000000..b8b3d1c
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/OpenPartitionDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/OpenRuntime.efi b/OpenCore/EFI/OC/Drivers/OpenRuntime.efi
new file mode 100644
index 0000000..18da726
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/OpenRuntime.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/OpenUsbKbDxe.efi b/OpenCore/EFI/OC/Drivers/OpenUsbKbDxe.efi
new file mode 100644
index 0000000..0e9968e
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/OpenUsbKbDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/Ps2KeyboardDxe.efi b/OpenCore/EFI/OC/Drivers/Ps2KeyboardDxe.efi
new file mode 100644
index 0000000..8314154
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/Ps2KeyboardDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/Ps2MouseDxe.efi b/OpenCore/EFI/OC/Drivers/Ps2MouseDxe.efi
new file mode 100644
index 0000000..0238d78
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/Ps2MouseDxe.efi differ
diff --git a/OpenCore/EFI/OC/Drivers/UsbMouseDxe.efi b/OpenCore/EFI/OC/Drivers/UsbMouseDxe.efi
new file mode 100644
index 0000000..f87a62f
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/UsbMouseDxe.efi differ
diff --git a/OpenCore-Catalina/EFI/OC/Drivers/VBoxHfs.efi b/OpenCore/EFI/OC/Drivers/VBoxHfs.efi
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Drivers/VBoxHfs.efi
rename to OpenCore/EFI/OC/Drivers/VBoxHfs.efi
diff --git a/OpenCore/EFI/OC/Drivers/XhciDxe.efi b/OpenCore/EFI/OC/Drivers/XhciDxe.efi
new file mode 100644
index 0000000..df4824b
Binary files /dev/null and b/OpenCore/EFI/OC/Drivers/XhciDxe.efi differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/AGPMInjector.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/AGPMInjector.kext/Contents/Info.plist
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/AGPMInjector.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/AGPMInjector.kext/Contents/Info.plist
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/AppleALC.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/AppleALC.kext/Contents/Info.plist
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/AppleALC.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/AppleALC.kext/Contents/Info.plist
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/AppleALC.kext/Contents/MacOS/AppleALC b/OpenCore/EFI/OC/Kexts/AppleALC.kext/Contents/MacOS/AppleALC
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/AppleALC.kext/Contents/MacOS/AppleALC
rename to OpenCore/EFI/OC/Kexts/AppleALC.kext/Contents/MacOS/AppleALC
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/AppleALC.kext/Contents/_CodeSignature/CodeResources b/OpenCore/EFI/OC/Kexts/AppleALC.kext/Contents/_CodeSignature/CodeResources
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/AppleALC.kext/Contents/_CodeSignature/CodeResources
rename to OpenCore/EFI/OC/Kexts/AppleALC.kext/Contents/_CodeSignature/CodeResources
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
similarity index 81%
rename from OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
index c51a509..da57ab6 100644
--- a/OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
+++ b/OpenCore/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist
@@ -3,7 +3,7 @@
BuildMachineOSBuild
- 19H524
+ 19H1323
CFBundleDevelopmentRegion
en
CFBundleExecutable
@@ -17,7 +17,7 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.3
+ 1.5.6
CFBundleSignature
????
CFBundleSupportedPlatforms
@@ -25,7 +25,7 @@
MacOSX
CFBundleVersion
- 1.5.3
+ 1.5.6
DTCompiler
com.apple.compilers.llvm.clang.1_0
DTPlatformBuild
@@ -55,7 +55,7 @@
IOProviderClass
IOResources
IOResourceMatch
- IOKit
+ IOBSD
LSMinimumSystemVersion
@@ -65,6 +65,21 @@
OSBundleCompatibleVersion
1.2.0
OSBundleLibraries
+
+ com.apple.kernel.6.0
+ 7.9.9
+ com.apple.kpi.bsd
+ 8.0.0
+ com.apple.kpi.iokit
+ 8.0.0
+ com.apple.kpi.libkern
+ 8.0.0
+ com.apple.kpi.mach
+ 8.0.0
+ com.apple.kpi.unsupported
+ 8.0.0
+
+ OSBundleLibraries_x86_64
com.apple.kpi.bsd
10.0.0
diff --git a/OpenCore/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu b/OpenCore/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu
new file mode 100644
index 0000000..afc2b3a
Binary files /dev/null and b/OpenCore/EFI/OC/Kexts/Lilu.kext/Contents/MacOS/Lilu differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/MCEReporterDisabler.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/MCEReporterDisabler.kext/Contents/Info.plist
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/MCEReporterDisabler.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/MCEReporterDisabler.kext/Contents/Info.plist
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
similarity index 93%
rename from OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
index 0882b0b..582ea79 100644
--- a/OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
+++ b/OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
@@ -3,7 +3,7 @@
BuildMachineOSBuild
- 19H1217
+ 19H1323
CFBundleDevelopmentRegion
en
CFBundleExecutable
@@ -17,7 +17,7 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.2.4
+ 1.2.7
CFBundleSignature
????
CFBundleSupportedPlatforms
@@ -25,7 +25,7 @@
MacOSX
CFBundleVersion
- 1.2.4
+ 1.2.7
DTCompiler
com.apple.compilers.llvm.clang.1_0
DTPlatformBuild
@@ -390,14 +390,31 @@
OSBundleCompatibleVersion
1.0
OSBundleLibraries
+
+ as.vit9696.Lilu
+ 1.2.0
+ com.apple.iokit.IOACPIFamily
+ 1.0.0d1
+ com.apple.kernel.6.0
+ 7.9.9
+ com.apple.kpi.bsd
+ 8.0.0
+ com.apple.kpi.iokit
+ 8.0.0
+ com.apple.kpi.libkern
+ 8.0.0
+ com.apple.kpi.mach
+ 8.0.0
+ com.apple.kpi.unsupported
+ 8.0.0
+
+ OSBundleLibraries_x86_64
as.vit9696.Lilu
1.2.0
com.apple.iokit.IOACPIFamily
1.0.0d1
com.apple.kpi.bsd
- 10.0.0
- com.apple.kpi.dsep
10.0.0
com.apple.kpi.iokit
10.0.0
diff --git a/OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC b/OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC
new file mode 100755
index 0000000..d9e9696
Binary files /dev/null and b/OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/_CodeSignature/CodeResources b/OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/_CodeSignature/CodeResources
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/_CodeSignature/CodeResources
rename to OpenCore/EFI/OC/Kexts/VirtualSMC.kext/Contents/_CodeSignature/CodeResources
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist b/OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
similarity index 91%
rename from OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
rename to OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
index 6aed00f..320ec20 100644
--- a/OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
+++ b/OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist
@@ -3,7 +3,7 @@
BuildMachineOSBuild
- 19H1217
+ 19H1417
CFBundleDevelopmentRegion
en
CFBundleExecutable
@@ -17,7 +17,7 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.0
+ 1.5.4
CFBundleSignature
????
CFBundleSupportedPlatforms
@@ -25,7 +25,7 @@
MacOSX
CFBundleVersion
- 1.5.0
+ 1.5.4
DTCompiler
com.apple.compilers.llvm.clang.1_0
DTPlatformBuild
@@ -76,7 +76,7 @@
LSMinimumSystemVersion
- 10.8
+ 10.6
NSHumanReadableCopyright
Copyright © 2018 vit9696. All rights reserved.
OSBundleCompatibleVersion
@@ -88,17 +88,17 @@
com.apple.iokit.IOPCIFamily
1.0.0b1
com.apple.kpi.bsd
- 12.0.0
+ 10.0.0
com.apple.kpi.dsep
- 12.0.0
+ 10.0.0
com.apple.kpi.iokit
- 12.0.0
+ 10.0.0
com.apple.kpi.libkern
- 12.0.0
+ 10.0.0
com.apple.kpi.mach
- 12.0.0
+ 10.0.0
com.apple.kpi.unsupported
- 12.0.0
+ 10.0.0
OSBundleRequired
Root
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen b/OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen
similarity index 65%
rename from OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen
rename to OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen
index 15874f6..7158fe1 100755
Binary files a/OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen and b/OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/MacOS/WhateverGreen differ
diff --git a/OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/_CodeSignature/CodeResources b/OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/_CodeSignature/CodeResources
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/_CodeSignature/CodeResources
rename to OpenCore/EFI/OC/Kexts/WhateverGreen.kext/Contents/_CodeSignature/CodeResources
diff --git a/OpenCore/EFI/OC/OpenCore.efi b/OpenCore/EFI/OC/OpenCore.efi
new file mode 100644
index 0000000..1b9b407
Binary files /dev/null and b/OpenCore/EFI/OC/OpenCore.efi differ
diff --git a/OpenCore/EFI/OC/Tools/BootKicker.efi b/OpenCore/EFI/OC/Tools/BootKicker.efi
new file mode 100644
index 0000000..674ab7a
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/BootKicker.efi differ
diff --git a/OpenCore/EFI/OC/Tools/ChipTune.efi b/OpenCore/EFI/OC/Tools/ChipTune.efi
new file mode 100644
index 0000000..69955c4
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/ChipTune.efi differ
diff --git a/OpenCore/EFI/OC/Tools/CleanNvram.efi b/OpenCore/EFI/OC/Tools/CleanNvram.efi
new file mode 100644
index 0000000..3bacecf
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/CleanNvram.efi differ
diff --git a/OpenCore/EFI/OC/Tools/ControlMsrE2.efi b/OpenCore/EFI/OC/Tools/ControlMsrE2.efi
new file mode 100644
index 0000000..b9a425c
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/ControlMsrE2.efi differ
diff --git a/OpenCore/EFI/OC/Tools/CsrUtil.efi b/OpenCore/EFI/OC/Tools/CsrUtil.efi
new file mode 100644
index 0000000..ded6e1a
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/CsrUtil.efi differ
diff --git a/OpenCore/EFI/OC/Tools/GopStop.efi b/OpenCore/EFI/OC/Tools/GopStop.efi
new file mode 100644
index 0000000..3b43a60
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/GopStop.efi differ
diff --git a/OpenCore/EFI/OC/Tools/KeyTester.efi b/OpenCore/EFI/OC/Tools/KeyTester.efi
new file mode 100644
index 0000000..26d4a65
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/KeyTester.efi differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/MmapDump.efi b/OpenCore/EFI/OC/Tools/MmapDump.efi
similarity index 56%
rename from OpenCore-Catalina/EFI/OC/Tools/MmapDump.efi
rename to OpenCore/EFI/OC/Tools/MmapDump.efi
index a91591b..cdae148 100644
Binary files a/OpenCore-Catalina/EFI/OC/Tools/MmapDump.efi and b/OpenCore/EFI/OC/Tools/MmapDump.efi differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/KeyTester.efi b/OpenCore/EFI/OC/Tools/OpenControl.efi
similarity index 55%
rename from OpenCore-Catalina/EFI/OC/Tools/KeyTester.efi
rename to OpenCore/EFI/OC/Tools/OpenControl.efi
index 3a991f1..5ed3ac0 100644
Binary files a/OpenCore-Catalina/EFI/OC/Tools/KeyTester.efi and b/OpenCore/EFI/OC/Tools/OpenControl.efi differ
diff --git a/OpenCore/EFI/OC/Tools/OpenShell.efi b/OpenCore/EFI/OC/Tools/OpenShell.efi
new file mode 100644
index 0000000..7ecc7f4
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/OpenShell.efi differ
diff --git a/OpenCore/EFI/OC/Tools/ResetSystem.efi b/OpenCore/EFI/OC/Tools/ResetSystem.efi
new file mode 100644
index 0000000..15d11c3
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/ResetSystem.efi differ
diff --git a/OpenCore/EFI/OC/Tools/RtcRw.efi b/OpenCore/EFI/OC/Tools/RtcRw.efi
new file mode 100644
index 0000000..24448ec
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/RtcRw.efi differ
diff --git a/OpenCore/EFI/OC/Tools/TpmInfo.efi b/OpenCore/EFI/OC/Tools/TpmInfo.efi
new file mode 100644
index 0000000..ee3547c
Binary files /dev/null and b/OpenCore/EFI/OC/Tools/TpmInfo.efi differ
diff --git a/OpenCore-Catalina/EFI/OC/Tools/VerifyMsrE2.efi b/OpenCore/EFI/OC/Tools/VerifyMsrE2.efi
similarity index 100%
rename from OpenCore-Catalina/EFI/OC/Tools/VerifyMsrE2.efi
rename to OpenCore/EFI/OC/Tools/VerifyMsrE2.efi
diff --git a/OpenCore-Catalina/OpenCore.qcow2 b/OpenCore/OpenCore.qcow2
similarity index 85%
rename from OpenCore-Catalina/OpenCore.qcow2
rename to OpenCore/OpenCore.qcow2
index bbdc25a..fdce401 100644
Binary files a/OpenCore-Catalina/OpenCore.qcow2 and b/OpenCore/OpenCore.qcow2 differ
diff --git a/OpenCore-Catalina/README.md b/OpenCore/README.md
similarity index 77%
rename from OpenCore-Catalina/README.md
rename to OpenCore/README.md
index 3301197..f8dad51 100644
--- a/OpenCore-Catalina/README.md
+++ b/OpenCore/README.md
@@ -2,16 +2,14 @@
Catalina installs the same way as Mojave.
-Tested with macOS Catalina 10.15.7 with OpenCore-0.7.0-RELEASE.zip release
-(June, 2021).
-
-Note: Our `config.plist` is buggy and we need to fix it!
+Tested with macOS Big sur with OpenCore-0.7.4-RELEASE.zip release in October,
+2021.
Note: Use `create_iso_catalina.sh` for generating a macOS Catalina based "ISO"
(actually DMG) image.
-Attention: Use 64-bit Ubuntu 20.04 LTS as the host OS for "best" results.
-Guestfish output results may vary across platforms.
+Attention: Use 64-bit Ubuntu 20.04 LTS or later as the host OS for "best"
+results. Guestfish output results may vary across platforms.
```
# Normal OpenCore Image
diff --git a/OpenCore-Catalina/config.plist b/OpenCore/config.plist
similarity index 79%
rename from OpenCore-Catalina/config.plist
rename to OpenCore/config.plist
index b6e9c5f..fb47a43 100644
--- a/OpenCore-Catalina/config.plist
+++ b/OpenCore/config.plist
@@ -8,11 +8,51 @@
Comment
- add DTGP method
+ My custom DSDT
Enabled
-
+
Path
- SSDT-DTGP.aml
+ DSDT.aml
+
+
+ Comment
+ My custom SSDT
+ Enabled
+
+ Path
+ SSDT-1.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-ALS0.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-AWAC-DISABLE.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-BRG0.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-EC-USBX.aml
Comment
@@ -24,11 +64,19 @@
Comment
- USB 2.0 Injection
+ Read the comment in dsl sample
Enabled
-
+
Path
- SSDT-EHCI.aml
+ SSDT-EHCx-DISABLE.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-IMEI.aml
Comment
@@ -38,6 +86,78 @@
Path
SSDT-PLUG.aml
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-PMC.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-PNLF.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-PNLFCFL.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-RTC0-RANGE.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-RTC0.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-SBUS-MCHC.aml
+
+
+ Comment
+ Read the comment in dsl sample
+ Enabled
+
+ Path
+ SSDT-UNC.aml
+
+
+ Comment
+ add DTGP method
+ Enabled
+
+ Path
+ SSDT-DTGP.aml
+
+
+ Comment
+ USB 2.0 Injection
+ Enabled
+
+ Path
+ SSDT-EHCI.aml
+
Delete
@@ -145,6 +265,8 @@
ResetLogoStatus
+ SyncTableIds
+
Booter
@@ -218,7 +340,7 @@
Arch
- x86_64
+ Any
BundlePath
Lilu.kext
Comment
@@ -230,13 +352,13 @@
MaxKernel
MinKernel
- 10.0.0
+ 8.0.0
PlistPath
Contents/Info.plist
Arch
- x86_64
+ Any
BundlePath
VirtualSMC.kext
Comment
@@ -248,7 +370,7 @@
MaxKernel
MinKernel
- 10.0.0
+ 8.0.0
PlistPath
Contents/Info.plist
@@ -266,7 +388,7 @@
MaxKernel
MinKernel
- 12.0.0
+ 10.0.0
PlistPath
Contents/Info.plist
@@ -274,17 +396,17 @@
Arch
Any
BundlePath
- VoodooHDA.kext
+ AppleALC.kext
Comment
-
+ Audio patches
Enabled
ExecutablePath
- Contents/MacOS/VoodooHDA
+ Contents/MacOS/AppleALC
MaxKernel
MinKernel
-
+ 8.0.0
PlistPath
Contents/Info.plist
@@ -302,7 +424,7 @@
MaxKernel
MinKernel
-
+ 13.0.0
PlistPath
Contents/Info.plist
@@ -433,6 +555,8 @@
Contents/Info.plist
+ Arch
+ x86_64
BundlePath
USBPorts.kext
Comment
@@ -449,6 +573,8 @@
Contents/Info.plist
+ Arch
+ x86_64
BundlePath
AGPMInjector.kext
Comment
@@ -526,7 +652,7 @@
Arch
- Any
+ x86_64
Base
Comment
@@ -563,7 +689,7 @@
Arch
- Any
+ x86_64
Base
Comment
@@ -644,10 +770,12 @@
Scheme
+ CustomKernel
+
FuzzyMatch
KernelArch
- x86_64
+ Auto
KernelCache
Auto
@@ -789,7 +917,7 @@
Comment
Perform shutdown
Enabled
-
+
Flavour
Auto
Name
@@ -821,6 +949,8 @@
7C436110-AB2A-4BBB-A880-FE41995C9F82
+ ForceDisplayRotationInEFI
+ 0
SystemAudioVolume
Rg==
boot-args
@@ -833,8 +963,6 @@
ZW4tVVM6MA==
run-efi-updater
No
- ForceDisplayRotationInEFI
- 0
Delete
@@ -952,6 +1080,8 @@
Builtin
CustomDelays
+ GraphicsInputMirroring
+
KeyInitialDelay
50
KeySubsequentDelay
@@ -986,20 +1116,166 @@
Drivers
- VBoxHfs.efi
+
+ Arguments
+
+ Comment
+ HFS+ Driver
+ Enabled
+
+ Path
+ OpenHfsPlus.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
OpenRuntime.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
OpenCanopy.efi
- #AudioDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ AudioDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
OpenPartitionDxe.efi
- #OpenUsbKbDxe.efi
- #UsbMouseDxe.efi
- #Ps2KeyboardDxe.efi
- #Ps2MouseDxe.efi
- #HiiDatabase.efi
- #NvmExpressDxe.efi
- #XhciDxe.efi
- #ExFatDxe.efi
- #CrScreenshotDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ OpenUsbKbDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ UsbMouseDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ Ps2KeyboardDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ Ps2MouseDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ HiiDatabase.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ NvmExpressDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ XhciDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ ExFatDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ CrScreenshotDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ ext4_x64.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ Path
+ OpenLinuxBoot.efi
+
Input
@@ -1098,6 +1374,8 @@
ExitBootServicesDelay
0
+ ForceOcWriteFlash
+
ForgeUefiSupport
IgnoreInvalidFlexRatio
diff --git a/OpenCore-Catalina/create_iso_catalina.sh b/OpenCore/create_iso_catalina.sh
similarity index 100%
rename from OpenCore-Catalina/create_iso_catalina.sh
rename to OpenCore/create_iso_catalina.sh
diff --git a/OpenCore-Catalina/opencore-image-ng.sh b/OpenCore/opencore-image-ng.sh
similarity index 100%
rename from OpenCore-Catalina/opencore-image-ng.sh
rename to OpenCore/opencore-image-ng.sh
diff --git a/OpenCore-Catalina/startup.nsh b/OpenCore/startup.nsh
similarity index 100%
rename from OpenCore-Catalina/startup.nsh
rename to OpenCore/startup.nsh
diff --git a/README.md b/README.md
index 309136d..a9455a3 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Phenom II X3 720 does not. Ryzen processors work just fine.
```
sudo apt-get install qemu uml-utilities virt-manager git \
- wget libguestfs-tools p7zip-full -y
+ wget libguestfs-tools p7zip-full make -y
```
This step may need to be adapted for your Linux distribution.
@@ -84,6 +84,8 @@ Phenom II X3 720 does not. Ryzen processors work just fine.
sudo usermod -aG kvm $(whoami)
```
+ Note: Re-login after executing this command.
+
* Clone this repository on your QEMU system. Files from this repository are
used in the following steps.
@@ -121,7 +123,7 @@ Phenom II X3 720 does not. Ryzen processors work just fine.
```
Note: Modern NVIDIA GPUs are supported on HighSierra but not on later
- versions.
+ versions of macOS.
* Convert the downloaded `BaseSystem.dmg` file into the `BaseSystem.img` file.
@@ -173,6 +175,13 @@ Phenom II X3 720 does not. Ryzen processors work just fine.
virsh --connect qemu:///system define macOS.xml
```
+ - If needed, grant necessary permissions to libvirt-qemu user,
+
+ ```
+ sudo setfacl -m u:libvirt-qemu:rx /home/$USER
+ sudo setfacl -R -m u:libvirt-qemu:rx /home/$USER/OSX-KVM
+ ```
+
- Launch `virt-manager` and start the `macOS` virtual machine.
Note: You may need to run `sudo ip link delete tap0` command before
diff --git a/UNRAID.md b/UNRAID.md
index f2487bc..a94e816 100644
--- a/UNRAID.md
+++ b/UNRAID.md
@@ -20,7 +20,7 @@ Ensure you have VM support and passthrough parameters prepared (VFIO devices, PC
## Preparing the VM
Below are sample instructions for setting up the VM. We will keep the necessary files in the same directory for simplicity.
-* Place these 3 files `BaseSystem.img`, `mac_hdd_ng.img` and `OSX-KVM/OpenCore-Catalina/OpenCore.qcow2` into the directory of your VM
+* Place these 3 files `BaseSystem.img`, `mac_hdd_ng.img` and `OSX-KVM/OpenCore/OpenCore.qcow2` into the directory of your VM
* ie: Into `/mnt/user/domains/BigSur`, where domains is the folder for your VMs
* Create a new VM and edit the XML. Use the OSX-KVM repository's `macOS-libvirt-Catalina.xml` as a guide
* ie: You also have the option to use the GUI to adjust the CPUs, RAM, setting the OS installation media and disk images, as well as the devices you wish to pass into the VM. However, each time the template is edited via the GUI, you must go in the XML editor and paste the qemu args at the bottom of the XML file.
diff --git a/boot-macOS-headless.sh b/boot-macOS-headless.sh
index ea021b6..f79d56c 100755
--- a/boot-macOS-headless.sh
+++ b/boot-macOS-headless.sh
@@ -54,7 +54,7 @@ args=(
-drive if=pflash,format=raw,snapshot=on,file="$REPO_PATH/$OVMF_DIR/OVMF_VARS-1024x768.fd"
-smbios type=2
-device ich9-ahci,id=sata
- # -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore-Catalina/OpenCore.qcow2"
+ # -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore/OpenCore.qcow2"
-device ide-hd,bus=sata.2,drive=OpenCoreBoot
-device ide-hd,bus=sata.3,drive=InstallMedia
-drive id=InstallMedia,if=none,file="$REPO_PATH/BaseSystem.img",format=raw
diff --git a/boot-passthrough.sh b/boot-passthrough.sh
index 30a18d2..4d2c410 100755
--- a/boot-passthrough.sh
+++ b/boot-passthrough.sh
@@ -49,7 +49,7 @@ args=(
-smbios type=2
-device ich9-intel-hda -device hda-duplex
-device ich9-ahci,id=sata
- # -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore-Catalina/OpenCore.qcow2"
+ # -drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file="$REPO_PATH/OpenCore/OpenCore.qcow2"
-device ide-hd,bus=sata.2,drive=OpenCoreBoot
-device ide-hd,bus=sata.3,drive=InstallMedia
-drive id=InstallMedia,if=none,file="$REPO_PATH/BaseSystem.img",format=raw
diff --git a/macOS-libvirt-Catalina.xml b/macOS-libvirt-Catalina.xml
index 0053476..fcaefa4 100644
--- a/macOS-libvirt-Catalina.xml
+++ b/macOS-libvirt-Catalina.xml
@@ -62,7 +62,7 @@
/usr/bin/qemu-system-x86_64
-
+
@@ -139,11 +139,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/notes.md b/notes.md
index 2c57ed2..0c97527 100644
--- a/notes.md
+++ b/notes.md
@@ -19,10 +19,10 @@ Also tweaking the `smbios.plist` file can help (?).
### Change resolution in OpenCore
```diff
-diff --git a/OpenCore-Catalina/config.plist b/OpenCore-Catalina/config.plist
+diff --git a/OpenCore/config.plist b/OpenCore/config.plist
index 4754e8c..489570f 100644
---- a/OpenCore-Catalina/config.plist
-+++ b/OpenCore-Catalina/config.plist
+--- a/OpenCore/config.plist
++++ b/OpenCore/config.plist
@@ -692,7 +692,7 @@
ConsoleMode
@@ -144,7 +144,7 @@ AMD RX 570 GPU (May 2021).
01:00.1 Audio device [0403]: Advanced Micro Devices, Inc. [AMD/ATI] Ellesmere HDMI Audio [Radeon RX 470/480 / 570/580/590] [1002:aaf0] (rev ff)
```
-* Fix permisions for the `/dev/vfio/1` device (modify as needed):
+* Fix permissions for the `/dev/vfio/1` device (modify as needed):
```
sudo cp vfio-kvm.rules /etc/udev/rules.d/vfio-kvm.rules
@@ -393,7 +393,12 @@ get some performance gain.
### Permission problems with libvirt / qemu?
```
-sudo setfacl -m u:libvirt-qemu:rx # fix virt-manager perm problems
+sudo setfacl -m u:libvirt-qemu:rx /home/$USER
+sudo setfacl -R -m u:libvirt-qemu:rx /home/$USER/OSX-KVM
+
+In general,
+
+sudo setfacl -R -m u:libvirt-qemu:rx # fix virt-manager perm problems
```
diff --git a/resources/OcBinaryData b/resources/OcBinaryData
index 6dd2d92..dcf5032 160000
--- a/resources/OcBinaryData
+++ b/resources/OcBinaryData
@@ -1 +1 @@
-Subproject commit 6dd2d92383edee522052ebbe2c634c92894b37e6
+Subproject commit dcf5032351154034e7c8ef6fd15674b1c71e3d92