Merge branch 'dortania:main' into main

CHANGELOG.md

@@ -1,6 +1,8 @@
 # OpenCore Legacy Patcher changelog
 
 ## 0.4.8
+- Ensure Apple Silicon-specific installers are not listed
+  - ie. M2 specific build (21F2092)
 
 ## 0.4.7
 - Fix crashing on defaults parsing

docs/INSTALLER.md

@@ -28,6 +28,14 @@ For this example, we'll assume you'll need an installer. Selecting this option w
 
 Since the patcher officially supports Big Sur and newer for patching, only those entires will be shown. For ourselves, we'll select 12.1 as that's the latest public release at the time of writing. This will download and install the macOS installer to your applications folder.
 
+::: warning
+
+With the release of the M2 MacBooks, Apple made an Apple Silicon only installer labeled "macOS 12.4 (21F2092 - 11.7GB)". Trying to boot this on Intel will not work.
+
+Instead, download "macOS 12.4 (21F79 - 12.1GB)" or newer.
+
+:::
+
 | Downloading the Installer | Requesting to install | Finished Installing |
 | :--- | :--- | :--- |
 | ![OCLP GUI Installer Download Progress](../images/OCLP-GUI-Installer-Download-Progress.png) | ![OCLP GUI Installer Needs Installing](../images/OCLP-GUI-Installer-Needs-Installing.png) | ![OCLP GUI Installer Download Finished](../images/OCLP-GUI-Installer-Download-Finished.png) |

gui/gui_main.py

@@ -231,10 +231,13 @@ class wx_python_gui:
             extension = ""
             if event:
                 if event.GetEventObject() != wx.Menu:
-                    if event.GetEventObject().GetLabel() == "Start Root Patching":
-                        extension = " --gui_patch"
-                    elif event.GetEventObject().GetLabel() == "Revert Root Patches":
-                        extension = " --gui_unpatch"
+                    try:
+                        if event.GetEventObject().GetLabel() == "Start Root Patching":
+                            extension = " --gui_patch"
+                        elif event.GetEventObject().GetLabel() == "Revert Root Patches":
+                            extension = " --gui_unpatch"
+                    except TypeError:
+                        pass
 
             if self.constants.launcher_script is None:
                 args_string = f"'{self.constants.launcher_binary}'{extension}"

resources/installer.py

@@ -135,6 +135,9 @@ def list_downloadable_macOS_installers(download_path, catalog):
                             build_plist = plistlib.loads(requests.get(bm_package["URL"]).content)
                         except plistlib.InvalidFileException:
                             continue
+                        # Ensure Apple Silicon specific Installers are not listed
+                        if "VMM-x86_64" not in build_plist["MobileAssetProperties"]["SupportedDeviceModels"]:
+                            continue
                         version = build_plist["MobileAssetProperties"]["OSVersion"]
                         build = build_plist["MobileAssetProperties"]["Build"]
                         try: