Merge branch 'main' into ventura-alpha

.github/workflows/build-app.yml

@@ -16,7 +16,7 @@ jobs:
       commitdate: ${{ github.event.head_commit.timestamp }}
     steps:
       - uses: actions/checkout@v3
-      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch ${{ env.branch }} --commit ${{ env.commiturl }} --commit_date ${{ env.commitdate }}
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}"
       - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
       - run: cd dist; zip -r ../OpenCore-Patcher-TUI.app.zip OpenCore-Patcher.app
       - run: ./../sign-tui.sh
@@ -26,13 +26,5 @@ jobs:
           name: OpenCore-Patcher-TUI.app
           path: OpenCore-Patcher-TUI.app.zip
 
-      - name: Upload to Release
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: OpenCore-Patcher-TUI.app.zip
-          tag: ${{ github.ref }}
-          file_glob: true
       - name: Validate OpenCore
         run: ./dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher --validate

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 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
 - Ventura Specific Updates:

docs/BOOT.md

@@ -8,6 +8,50 @@ Reboot machine while holding `Option` to select the EFI Boot entry with the Open
 
 ![](../images/efi-boot.png)
 
+::: details Note for Mac Pros/Xserves/iMacs with unflashed GPUs
+
+(Adapted from the [OpenCore on the Mac Pro guide](https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/))
+
+For Mac Pro, Xserve and, iMac users with non-flashed GPUs, you can still easily boot OpenCore and view the entire boot process.
+
+Firstly, open the Terminal and run the following command:
+```sh
+sudo nvram "recovery-boot-mode=unused" && sudo reboot recovery
+```
+This will make your machine reboot into the Recovery Environment. Alternatively, holding Command + R when your machine is starting up will also let you enter the Recovery.
+
+Secondly, open the Recovery Environment's Terminal (Menu bar > Utilities > Terminal).
+
+Now you'll want to get a list of drive identifiers. To do so, run the following command:
+```sh
+diskutil list
+```
+The command should produce a list of drives installed in your system:
+![](../images/Unflashed-Boot-1.png)
+
+Keep track of the drive with the OCLP install. You will need the drive identifer for later.
+
+Now you'll want to mount the EFI partition (where OCLP is installed, though may differ if you've installed OCLP to a FAT-32 volume).
+
+Run the following command (Replace X with the drive number):
+```sh
+diskutil mount diskXs1
+```
+![](../images/Unflashed-Boot-2.png)
+If everything is correct, the EFI partion should be mounted.
+
+Now you'll want to use the bless command to set the default boot device:
+```sh
+bless --mount /Volumes/EFI --setBoot --file /Volumes/EFI/System/Library/CoreServices/boot.efi
+```
+Once the command is run, it should produce no output.
+![](../images/Unflashed-Boot-3.png)
+
+If the command produces an output, ensure that you've typed it in correctly.
+
+Now you can reboot your machine. OCLP is now the default boot option!
+:::
+
 Now that you've loaded OpenCore, now select Install macOS:
 
 * This will be the OpenCore Picker
@@ -23,7 +67,7 @@ If your Mac is looping back into the beginning of the setup after the first rebo
 ![](../images/oclp-stuck-firstreboot.png)
 
 
-::: warning 
+::: warning
 
 **MacBookPro11,3 Note**: When booting macOS Monterey, you'll need to boot into safe mode if acceleration patches are not installed yet. [Otherwise you'll hit a black screen due to missing NVIDIA drivers.](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/522) Safe Mode can be entered by holding Shift+Enter when selecting macOS Monterey in OCLP's Boot Menu.
 

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) |

resources/constants.py

@@ -12,7 +12,7 @@ from data import os_data
 class Constants:
     def __init__(self):
         # Patcher Versioning
-        self.patcher_version = "0.4.7"  # OpenCore-Legacy-Patcher
+        self.patcher_version = "0.4.8"  # OpenCore-Legacy-Patcher
         self.patcher_support_pkg_version = "0.5.1"  #  PatcherSupportPkg
         self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
         self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/"

resources/global_settings.py

@@ -56,4 +56,7 @@ class global_settings:
                 return
 
             # delete defaults plist
-            Path(defaults_path).unlink()
+            try:
+                Path(defaults_path).unlink()
+            except PermissionError:
+                print("- Permission error: Unable to delete defaults plist")

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: