Update binaries to release build

CHANGELOG.md

@@ -1,6 +1,9 @@
 # OpenCore Legacy Patcher changelog
 
 ## 0.3.1
+- Increment Binaries:
+  - OpenCorePkg 0.7.4 release
+  - RestrictEvents 1.0.5 release
 
 ## 0.3.0
 - Fix Nvidia Tesla Acceleration in Monterey Beta 7+

payloads/Config/config.plist

@@ -1540,7 +1540,7 @@
 			<key>ScanPolicy</key>
 			<integer>0</integer>
 			<key>SecureBootModel</key>
-			<string>j137</string>
+			<string>Default</string>
 			<key>Vault</key>
 			<string>Optional</string>
 		</dict>
@@ -1849,6 +1849,8 @@
 		<key>Drivers</key>
 		<array>
 			<dict>
+				<key>Comment</key>
+				<string></string>
 				<key>Path</key>
 				<string>OpenRuntime.efi</string>
 				<key>Enabled</key>
@@ -1857,6 +1859,8 @@
 				<string></string>
 			</dict>
 			<dict>
+				<key>Comment</key>
+				<string></string>
 				<key>Path</key>
 				<string>OpenCanopy.efi</string>
 				<key>Enabled</key>
@@ -1865,6 +1869,8 @@
 				<string></string>
 			</dict>
 			<dict>
+				<key>Comment</key>
+				<string></string>
 				<key>Path</key>
 				<string>NvmExpressDxe.efi</string>
 				<key>Enabled</key>
@@ -1873,6 +1879,8 @@
 				<string></string>
 			</dict>
 			<dict>
+				<key>Comment</key>
+				<string></string>
 				<key>Path</key>
 				<string>ExFatDxeLegacy.efi</string>
 				<key>Enabled</key>
@@ -1881,6 +1889,8 @@
 				<string></string>
 			</dict>
 			<dict>
+				<key>Comment</key>
+				<string></string>
 				<key>Path</key>
 				<string>XhciDxe.efi</string>
 				<key>Enabled</key>
@@ -1889,6 +1899,8 @@
 				<string></string>
 			</dict>
 			<dict>
+				<key>Comment</key>
+				<string></string>
 				<key>Path</key>
 				<string>OpenLinuxBoot.efi</string>
 				<key>Enabled</key>

resources/build.py

@@ -100,8 +100,6 @@ class BuildOpenCore:
             ("Lilu.kext", self.constants.lilu_version, self.constants.lilu_path, lambda: True),
             ("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path, lambda: self.constants.allow_oc_everywhere is False and self.constants.serial_settings != "None"),
             ("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path, lambda: self.model in model_array.MacPro),
-            # Modded RestrictEvents with displaypolicyd blocked to fix dGPU switching
-            ("RestrictEvents.kext", self.constants.restrictevents_mbp_version, self.constants.restrictevents_mbp_path, lambda: self.model in ["MacBookPro6,1", "MacBookPro6,2", "MacBookPro9,1"]),
             ("SMC-Spoof.kext", self.constants.smcspoof_version, self.constants.smcspoof_path, lambda: self.constants.allow_oc_everywhere is False and self.constants.serial_settings != "None"),
             # CPU patches
             ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: (self.model.startswith("MacPro") or self.model.startswith("Xserve")) and self.constants.serial_settings != "None"),
@@ -167,6 +165,14 @@ class BuildOpenCore:
             # Required for Lilu in 11.0+
             self.config["Kernel"]["Quirks"]["DisableLinkeditJettison"] = True
         
+        if self.model in ["MacBookPro6,1", "MacBookPro6,2", "MacBookPro9,1", "MacBookPro10,1"]:
+            # Modded RestrictEvents with displaypolicyd blocked to fix dGPU switching
+            if self.model in ["MacBookPro6,1", "MacBookPro6,2", "MacBookPro9,1"]:
+                self.enable_kext("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path)
+            elif self.constants.serial_settings == "None":
+                # MacBookPro10,1 without SMBIOS spoof needs RestrictEvents
+                self.enable_kext("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path)
+
         # Ethernet Patch Sets
         if smbios_data.smbios_dictionary[self.model]["Ethernet Chipset"] == "Broadcom":
             if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.ivy_bridge.value:
@@ -174,13 +180,6 @@ class BuildOpenCore:
                 # Applicable for pre-Ivy Bridge models
                 self.enable_kext("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path)
 
-        if self.constants.allow_oc_everywhere is False and self.constants.serial_settings != "None":
-            if (smbios_data.smbios_dictionary[generate_smbios.set_smbios_model_spoof(self.model) or self.constants.override_smbios]["SecureBootModel"]) != None:
-                # Monterey T2 SMBIOS don't get OS updates without a T2 SBM
-                # Forces VMM patch instead
-                if self.get_kext_by_bundle_path("RestrictEvents.kext")["Enabled"] is False:
-                    self.enable_kext("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path)
-
         if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value:
             # Ref: https://github.com/reenigneorcim/SurPlus
             # Enable for all systems missing RDRAND support
@@ -740,6 +739,10 @@ class BuildOpenCore:
         if self.constants.secure_status is False:
             print("- Disabling SecureBootModel")
             self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled"
+            if self.constants.force_vmm is True:
+                print("- Forcing VMM patchset to support OTA updates")
+                self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (1)")["Enabled"] = True
+                self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2)")["Enabled"] = True
         if self.constants.serial_settings in ["Moderate", "Advanced"]:
             print("- Enabling USB Rename Patches")
             self.get_item_by_kv(self.config["ACPI"]["Patch"], "Comment", "XHC1 to SHC1")["Enabled"] = True

resources/constants.py

@@ -20,8 +20,8 @@ class Constants:
 
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
-        self.opencore_commit = "ff4b099 - 09-06-2021"
+        self.opencore_commit = "bd3f7a1 - 10-04-2021"
-        self.opencore_version = "0.7.3"
+        self.opencore_version = "0.7.4"
 
         # Kext Versioning
         ## Acidanthera
@@ -157,6 +157,7 @@ class Constants:
         self.force_latest_psp = False  #      Force latest PatcherSupportPkg
         self.disable_msr_power_ctl = False  # Disable MSR Power Control (missing battery throttling)
         self.software_demux = False  #        Enable Software Demux patch set
+        self.force_vmm = False  #             Force VMM patch 
 
         # OS Versions
         ## Based off Major Kernel Version

resources/defaults.py

@@ -1,6 +1,6 @@
 # Generate Default Data
-from resources import utilities, device_probe
+from resources import utilities, device_probe, generate_smbios
-from data import model_array
+from data import model_array, smbios_data
 
 
 class generate_defaults:
@@ -52,10 +52,6 @@ class generate_defaults:
                     settings.sip_status = False
                     # settings.secure_status = True  # Monterey
                     settings.allow_fv_root = True  #  Allow FileVault on broken seal
-                else:
-                    settings.sip_status = True
-                    # settings.secure_status = True  # Monterey
-                    settings.amfi_status = True
             else:
                 settings.sip_status = False  #    Unsigned kexts
                 settings.secure_status = False  # Root volume modified
@@ -87,3 +83,22 @@ class generate_defaults:
 
         # Check if running in RecoveryOS
         settings.recovery_status = utilities.check_recovery()
+
+        # Check if model uses T2 SMBIOS, if so see if it needs root patching (determined earlier on via SIP variable)
+        # If not, allow SecureBootModel usage, otherwise force VMM patching
+        # Needed for macOS Monterey to allow OTA updates
+        try:
+            spoof_model = generate_smbios.set_smbios_model_spoof(model)
+        except:
+            # Native Macs (mainly M1s) will error out as they don't know what SMBIOS to spoof to
+            # As we don't spoof on native models, we can safely ignore this
+            spoof_model = model
+        if smbios_data.smbios_dictionary[spoof_model]["SecureBootModel"] is not None:
+            if settings.sip_status is False:
+                # Force VMM as root patching is 
+                settings.secure_status = False
+                settings.force_vmm = True
+            else:
+                # Allow SecureBootModel
+                settings.secure_status = True
+                settings.force_vmm = False