Merge branch 'main' into sonoma-development

payloads/Config/config.plist

@@ -1657,7 +1657,7 @@
 				<key>Arch</key>
 				<string>x86_64</string>
 				<key>Comment</key>
-				<string>Aquantia Ethernet Patch - Core</string>
+				<string>Aquantia Ethernet Patch</string>
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
@@ -1671,24 +1671,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>Aquantia Ethernet Patch - Firmware</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string>21.4.0</string>
-				<key>BundlePath</key>
-				<string>AppleEthernetAbuantiaAqtionFirmware.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/AppleEthernetAbuantiaAqtionFirmware</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 		</array>
 		<key>Block</key>
 		<array>

resources/build/networking/wired.py

@@ -70,7 +70,6 @@ class BuildWiredNetworking:
                     continue
                 if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.ivy_bridge.value:
                     support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleEthernetAbuantiaAqtion.kext", self.constants.aquantia_version, self.constants.aquantia_path)
-                    support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleEthernetAbuantiaAqtionFirmware.kext", self.constants.aquantiafirmware_version, self.constants.aquantiafirmware_path)
 
 
     def _prebuilt_assumption(self) -> None:

resources/constants.py

@@ -77,8 +77,7 @@ class Constants:
         self.monterey_ahci_version:    str = "1.0.0"  # CatalinaAHCI
 
         ## Apple - Jazzzny Modified
-        self.aquantia_version: str = "1.0.0"  # AppleEthernetAbuantiaAqtion
+        self.aquantia_version: str = "1.1.0"  # AppleEthernetAbuantiaAqtion
-        self.aquantiafirmware_version: str = "1.0.0"  # AppleEthernetAbuantiaAqtionFirmware
 
         ## Dortania
         ## https://github.com/dortania
@@ -356,10 +355,6 @@ class Constants:
     def aquantia_path(self):
         return self.payload_kexts_path / Path(f"Ethernet/AppleEthernetAbuantiaAqtion-v{self.aquantia_version}.zip")
 
-    @property
-    def aquantiafirmware_path(self):
-        return self.payload_kexts_path / Path(f"Ethernet/AppleEthernetAbuantiaAqtionFirmware-v{self.aquantiafirmware_version}.zip")
-
     @property
     def i210_path(self):
         return self.payload_kexts_path / Path(f"Ethernet/CatalinaIntelI210Ethernet-v{self.i210_version}.zip")