diff --git a/OpenCore-Patcher.command b/OpenCore-Patcher.command index 71c45ad3d..e2c10ed38 100755 --- a/OpenCore-Patcher.command +++ b/OpenCore-Patcher.command @@ -84,6 +84,7 @@ while MainMenu: print (" %s" % Versions.current_path) print("") BuildOpenCore.BuildEFI() + BuildOpenCore.BuildGUI() BuildOpenCore.BuildSMBIOS() BuildOpenCore.SavePlist() BuildOpenCore.CleanBuildFolder() diff --git a/README.md b/README.md index 61feb95ad..bde940987 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,16 @@ Xserve3,1 ## How to run +Prerequists: + +* Supported Mac(see above) +* macOS Installer installed to USB + * Blank USB drives formatted as GUID Partition Table are also supported + 1. [Download the release](https://github.com/dortania/Opencore-Legacy-Patcher/releases) 2. Run the `OpenCore-Patcher.command` file 3. Once opened, select option 1 and build your EFI * if poatching for a different patching, selectect option 3 first -4. Once finished, run option 2 a the main menu and install onto your desired drive \ No newline at end of file +4. Once finished, run option 2 a the main menu and install onto your desired drive + +Once you're done making your OpenCore installer, you can simply reboot holding the Option key. In the picker, you should see a new EFI Boot Option. Boot it and from there you'll be in the OpenCore picker. \ No newline at end of file diff --git a/Resources/BuildOpenCore.py b/Resources/BuildOpenCore.py index 433488a3a..cc4d9cf1b 100644 --- a/Resources/BuildOpenCore.py +++ b/Resources/BuildOpenCore.py @@ -171,6 +171,15 @@ def BuildEFI(): map_name ) +def BuildGUI(): + print("- Adding OpenCanopy GUI") + rmtree(Versions.gui_path_build) + copy(Versions.gui_path, Versions.plist_path_build) + Versions.plist_data = Versions.plist_data.replace( + "#OpenCanopy.efi", + "OpenCanopy.efi" + ) + def BuildSMBIOS(): # Set new SMBIOS new_model = current_model @@ -251,6 +260,17 @@ def CleanBuildFolder(): zip_ref.close() os.remove(file_name) # Clean up Python's unzip + if os.path.exists("__MACOSX"): + rmtree("__MACOSX") + os.chdir(Versions.plist_path_build) + os.chdir(Versions.plist_path_build) + for item in os.listdir(Versions.plist_path_build): + if item.endswith(".zip"): + file_name = os.path.abspath(item) + zip_ref = zipfile.ZipFile(file_name) + zip_ref.extractall(Versions.plist_path_build) + zip_ref.close() + os.remove(file_name) if os.path.exists("__MACOSX"): rmtree("__MACOSX") os.chdir(Versions.build_path) diff --git a/Resources/ModelArray.py b/Resources/ModelArray.py index e167dbe5d..fff0c7653 100644 --- a/Resources/ModelArray.py +++ b/Resources/ModelArray.py @@ -326,6 +326,22 @@ NVMePatch = [ "Xserve3,1" ] +SidecarPatch = [ + "MacBookAir5,1", + "MacBookAir5,2", + "MacBookPro9,1", + "MacBookPro9,2", + "MacBookPro10,1", + "MacBookPro10,2", + "Macmini6,1", + "Macmini6,2", + "iMac13,1", + "iMac13,2", + "iMac14,1", + "iMac14,2", + "iMac14,3" +] + # 11" Air MacBookAir61 = [ "MacBookAir3,1", diff --git a/Resources/Versions.py b/Resources/Versions.py index 0821df5f7..736beaf8d 100644 --- a/Resources/Versions.py +++ b/Resources/Versions.py @@ -62,10 +62,11 @@ drivers_path_build = os.path.join(current_path, "Build-Folder/" "OpenCore-v%s/EF kext_path_build = os.path.join(current_path, "Build-Folder/" "OpenCore-v%s/EFI/OC/Kexts" % opencore_version) opencore_path_done = os.path.join(current_path, "Build-Folder/" "OpenCore-v%s" % opencore_version) build_path = os.path.join(current_path, r'Build-Folder/') +gui_path_build = os.path.join(current_path, "Build-Folder/" "OpenCore-v%s/EFI/OC/Resources" % opencore_version) # Tools macserial_path = os.path.join(current_path, "payloads/" "Tools") # Icons - -icon_path = os.path.join(current_path, "payloads/Icon/" ".VolumeIcon.icns") \ No newline at end of file +icon_path = os.path.join(current_path, "payloads/Icon/" ".VolumeIcon.icns") +gui_path = os.path.join(current_path, "payloads/Icon/" "Resources.zip") \ No newline at end of file diff --git a/payloads/Config/v0.6.3/config.plist b/payloads/Config/v0.6.3/config.plist index 191f037b9..4ce3cd188 100644 --- a/payloads/Config/v0.6.3/config.plist +++ b/payloads/Config/v0.6.3/config.plist @@ -776,7 +776,7 @@ Drivers #NvmExpressDxe.efi - OpenCanopy.efi + #OpenCanopy.efi OpenRuntime.efi Input diff --git a/payloads/Icon/Resources.zip b/payloads/Icon/Resources.zip new file mode 100644 index 000000000..45b0a6b40 Binary files /dev/null and b/payloads/Icon/Resources.zip differ diff --git a/payloads/OpenCore/OpenCore-v0.6.3.zip b/payloads/OpenCore/OpenCore-v0.6.3.zip index 27b391d67..fa6ece61a 100644 Binary files a/payloads/OpenCore/OpenCore-v0.6.3.zip and b/payloads/OpenCore/OpenCore-v0.6.3.zip differ