Implement new modern wireless patchset (#1178)

opencore_legacy_patcher/sys_patch/patchsets/detect.py

@@ -200,7 +200,7 @@ class HardwarePatchsetDetection:
             logging.error("Installed patches are from different commit, unpatching is required")
             return True
 
-        wireless_keys = {"Legacy Wireless", "Modern Wireless"}
+        wireless_keys = {"Legacy Wireless", "Modern Wireless Common"}
 
         # Keep in sync with generate_patchset_plist
         metadata_keys = {

opencore_legacy_patcher/sys_patch/patchsets/hardware/networking/modern_wireless.py

@@ -52,23 +52,18 @@ class ModernWireless(BaseHardware):
         """
         return HardwareVariant.NETWORKING
 
-
+    def _patches_modern_wireless_common_extended(self) -> dict:
-    def patches(self) -> dict:
         """
-        Patches for Modern Wireless
+        Extended modern wireless patches
         """
-        if self.native_os() is True:
+        if self._xnu_major > os_data.sonoma:
             return {}
 
         return {
-            "Modern Wireless": {
+            "Modern Wireless Extended": {
                 PatchType.OVERWRITE_SYSTEM_VOLUME: {
                     "/usr/libexec": {
                         "airportd": f"13.7.2-{self._xnu_major}",
-                        "wifip2pd": f"13.7.2-{self._xnu_major}",
-                    },
-                    "/System/Library/CoreServices": {
-                        **({ "WiFiAgent.app": "14.7.2" } if self._xnu_major >= os_data.sequoia else {}),
                     },
                 },
                 PatchType.MERGE_SYSTEM_VOLUME: {
@@ -77,9 +72,42 @@ class ModernWireless(BaseHardware):
                     },
                     "/System/Library/PrivateFrameworks": {
                         "CoreWiFi.framework":  f"13.7.2-{self._xnu_major}",
+                    },
+                },
+            },
+        }
+
+
+    def _patches_modern_wireless_common(self) -> dict:
+        """
+        Common modern wireless patches
+        """
+        return {
+            "Modern Wireless Common": {
+                PatchType.OVERWRITE_SYSTEM_VOLUME: {
+                    "/usr/libexec": {
+                        "wifip2pd": f"13.7.2-{self._xnu_major}",
+                    },
+                },
+                PatchType.MERGE_SYSTEM_VOLUME: {
+                    "/System/Library/PrivateFrameworks": {
                         "IO80211.framework":        f"13.7.2-{self._xnu_major}",
                         "WiFiPeerToPeer.framework": f"13.7.2-{self._xnu_major}",
                     },
-                }
+                },
             },
         }
+
+    def patches(self) -> dict:
+        """
+        Dictionary of patches
+        """
+        if self.native_os() is True:
+            return {}
+
+        return {
+            **self._patches_modern_wireless_common(),
+            **self._patches_modern_wireless_common_extended(),
+        }
+
+        return _base