diff --git a/LICENSE.txt b/LICENSE.txt index 41edb3b21..00009a2b4 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -8,7 +8,7 @@ Redistribution and use in source and binary forms, with or without modification, 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. All advertising materials mentioning features or use of this software must display the following acknowledgement: -This product includes software developed by the organization. -4. Neither the name of the copyright holder nor the names the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +This product includes software developed by Dortania and OpenCore Legacy Patcher contributors. +4. Neither the name of OpenCore Legacy Patcher, nor the names of Dortania, Dhinak G, or Mykola Grymalyuk may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY DHINAK G AND MYKOLA GRYMALYUK "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DHINAK G NOR MYKOLA GRYMALYUK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/docs/LICENSE.md b/docs/LICENSE.md index c38ce2737..21172e2b4 100644 --- a/docs/LICENSE.md +++ b/docs/LICENSE.md @@ -19,5 +19,6 @@ This patcher is made of multiple external applications from different people and * [SurPlus](https://github.com/reenigneorcim/SurPlus) - Syncretic * [VMM Patch Set](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/4a8f61a01da72b38a4b2250386cc4b497a31a839/payloads/Config/config.plist#L1222-L1281) - parrotgeek1 * Apple Binaries - Apple Inc. + * All other patches - respective authors -Remaining files within OpenCore Legacy Patcher are distributed under BSD-4-Clause license. +The remaining files within the OpenCore Legacy Patcher repository are distributed under the [BSD 4-Clause license](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/main/LICENSE.txt). diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist index e6372dd19..c783fb0ff 100644 --- a/payloads/Config/config.plist +++ b/payloads/Config/config.plist @@ -1585,7 +1585,7 @@ Arch x86_64 Comment - Aquantia Ethernet Patch - Core + Aquantia Ethernet Patch Enabled MaxKernel @@ -1599,24 +1599,6 @@ PlistPath Contents/Info.plist - - Arch - x86_64 - Comment - Aquantia Ethernet Patch - Firmware - Enabled - - MaxKernel - - MinKernel - 21.4.0 - BundlePath - AppleEthernetAbuantiaAqtionFirmware.kext - ExecutablePath - Contents/MacOS/AppleEthernetAbuantiaAqtionFirmware - PlistPath - Contents/Info.plist - Block diff --git a/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtion-v1.0.0.zip b/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtion-v1.0.0.zip deleted file mode 100644 index ac2be55da..000000000 Binary files a/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtion-v1.0.0.zip and /dev/null differ diff --git a/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtion-v1.1.0.zip b/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtion-v1.1.0.zip new file mode 100644 index 000000000..c07b2afba Binary files /dev/null and b/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtion-v1.1.0.zip differ diff --git a/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtionFirmware-v1.0.0.zip b/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtionFirmware-v1.0.0.zip deleted file mode 100644 index 5ff7c25ba..000000000 Binary files a/payloads/Kexts/Ethernet/AppleEthernetAbuantiaAqtionFirmware-v1.0.0.zip and /dev/null differ diff --git a/resources/build/networking/wired.py b/resources/build/networking/wired.py index 8e41b1f2a..342d022fc 100644 --- a/resources/build/networking/wired.py +++ b/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: diff --git a/resources/constants.py b/resources/constants.py index daf9d9f94..16379771c 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -74,8 +74,7 @@ class Constants: self.monterey_ahci_version: str = "1.0.0" # CatalinaAHCI ## Apple - Jazzzny Modified - self.aquantia_version: str = "1.0.0" # AppleEthernetAbuantiaAqtion - self.aquantiafirmware_version: str = "1.0.0" # AppleEthernetAbuantiaAqtionFirmware + self.aquantia_version: str = "1.1.0" # AppleEthernetAbuantiaAqtion ## Dortania ## https://github.com/dortania @@ -350,10 +349,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")