diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ffcb44e..12f9a8487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Increment Binaries: - OpenCorePkg 0.7.4 release - RestrictEvents 1.0.5 release + - WhateverGreen 1.5.4 release - Allow for setting custom SIP values via TUI - Drop `CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE` requirement for root patching - Lowers default SIP Disabled value to 0xA03 diff --git a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3.zip b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3.zip rename to payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3-RELEASE.zip b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3-RELEASE.zip new file mode 100644 index 000000000..f224023d7 Binary files /dev/null and b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/AppleALC-v1.6.3.zip b/payloads/Kexts/Acidanthera/AppleALC-v1.6.3-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/AppleALC-v1.6.3.zip rename to payloads/Kexts/Acidanthera/AppleALC-v1.6.3-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/AppleALC-v1.6.3-RELEASE.zip b/payloads/Kexts/Acidanthera/AppleALC-v1.6.3-RELEASE.zip new file mode 100644 index 000000000..a4354425f Binary files /dev/null and b/payloads/Kexts/Acidanthera/AppleALC-v1.6.3-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.0.zip b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.0.zip deleted file mode 100644 index d56c4bf30..000000000 Binary files a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.0.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4.zip b/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/CPUFriend-v1.2.4.zip rename to payloads/Kexts/Acidanthera/CPUFriend-v1.2.4-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4-RELEASE.zip b/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4-RELEASE.zip new file mode 100644 index 000000000..20dcaa931 Binary files /dev/null and b/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip b/payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip rename to payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4.zip b/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4.zip rename to payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4-RELEASE.zip b/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4-RELEASE.zip new file mode 100644 index 000000000..c11988c20 Binary files /dev/null and b/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3.zip b/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3.zip rename to payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3-RELEASE.zip b/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3-RELEASE.zip new file mode 100644 index 000000000..be99b2ea7 Binary files /dev/null and b/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/Lilu-v1.5.6.zip b/payloads/Kexts/Acidanthera/Lilu-v1.5.6-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/Lilu-v1.5.6.zip rename to payloads/Kexts/Acidanthera/Lilu-v1.5.6-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/Lilu-v1.5.6-RELEASE.zip b/payloads/Kexts/Acidanthera/Lilu-v1.5.6-RELEASE.zip new file mode 100644 index 000000000..6abc29e88 Binary files /dev/null and b/payloads/Kexts/Acidanthera/Lilu-v1.5.6-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9.zip b/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9-DEBUG.zip similarity index 100% rename from payloads/Kexts/Acidanthera/NVMeFix-v1.0.9.zip rename to payloads/Kexts/Acidanthera/NVMeFix-v1.0.9-DEBUG.zip diff --git a/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9-RELEASE.zip b/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9-RELEASE.zip new file mode 100644 index 000000000..62ce4d810 Binary files /dev/null and b/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.5-DEBUG.zip b/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.5-DEBUG.zip new file mode 100644 index 000000000..287bf0c61 Binary files /dev/null and b/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.5-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5.zip b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5-DEBUG.zip similarity index 78% rename from payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5.zip rename to payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5-DEBUG.zip index 0fb2b1827..2bfec5841 100644 Binary files a/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5.zip and b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5-RELEASE.zip b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5-RELEASE.zip new file mode 100644 index 000000000..b30992f71 Binary files /dev/null and b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.2.zip b/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.2.zip deleted file mode 100644 index f9c5c936b..000000000 Binary files a/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.2.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.3.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.3.zip deleted file mode 100644 index d1412b19a..000000000 Binary files a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.3.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-DEBUG.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-DEBUG.zip new file mode 100644 index 000000000..6074aeaca Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-RELEASE.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-RELEASE.zip new file mode 100644 index 000000000..9ca63d82f Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-RELEASE.zip differ diff --git a/resources/cli_menu.py b/resources/cli_menu.py index 2c57187ed..f39a8891c 100644 --- a/resources/cli_menu.py +++ b/resources/cli_menu.py @@ -46,8 +46,10 @@ class MenuOptions: change_menu = input("Enable Kext DEBUG mode(y/n/q): ") if change_menu in {"y", "Y", "yes", "Yes"}: self.constants.kext_debug = True + self.constants.kext_variant = "DEBUG" elif change_menu in {"n", "N", "no", "No"}: self.constants.kext_debug = False + self.constants.kext_variant = "RELEASE" elif change_menu in {"q", "Q", "Quit", "quit"}: print("Returning to previous menu") else: diff --git a/resources/constants.py b/resources/constants.py index c38bbe3d8..3bdb25d89 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -27,7 +27,7 @@ class Constants: ## Acidanthera ## https://github.com/acidanthera self.lilu_version = "1.5.6" # Lilu - self.whatevergreen_version = "1.5.3" # WhateverGreen + self.whatevergreen_version = "1.5.4" # WhateverGreen self.airportbcrmfixup_version = "2.1.3" # AirPortBrcmFixup self.nvmefix_version = "1.0.9" # NVMeFix self.applealc_version = "1.6.3" # AppleALC @@ -104,6 +104,7 @@ class Constants: ## Kext Settings self.kext_debug = False # Enables Lilu debug and DebugEnhancer + self.kext_variant = "RELEASE" ## NVRAM Settings self.verbose_debug = False # -v @@ -232,19 +233,19 @@ class Constants: @property def lilu_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}-{self.kext_variant}.zip") @property def whatevergreen_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}-{self.kext_variant}.zip") @property def airportbcrmfixup_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}-{self.kext_variant}.zip") @property def restrictevents_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}-{self.kext_variant}.zip") @property def efi_disabler_path(self): @@ -252,7 +253,7 @@ class Constants: @property def restrictevents_mbp_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}-{self.kext_variant}.zip") @property def bcm570_path(self): @@ -296,7 +297,7 @@ class Constants: @property def applealc_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}-{self.kext_variant}.zip") @property def piixata_path(self): @@ -320,15 +321,15 @@ class Constants: @property def nvmefix_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}-{self.kext_variant}.zip") @property def featureunlock_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/FeatureUnlock-v{self.featureunlock_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/FeatureUnlock-v{self.featureunlock_version}-{self.kext_variant}.zip") @property def debugenhancer_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/DebugEnhancer-v{self.debugenhancer_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/DebugEnhancer-v{self.debugenhancer_version}-{self.kext_variant}.zip") @property def bluetool_path(self): @@ -336,7 +337,7 @@ class Constants: @property def cslvfixup_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/CSLVFixup-v{self.cslvfixup_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/CSLVFixup-v{self.cslvfixup_version}.-{self.kext_variant}zip") @property def innie_path(self): diff --git a/resources/validation.py b/resources/validation.py index 33fe9ba54..dd5c647ae 100644 --- a/resources/validation.py +++ b/resources/validation.py @@ -59,6 +59,8 @@ def validate(settings): settings.opencore_debug = True settings.opencore_build = "DEBUG" settings.kext_debug = True + settings.kext_variant = "DEBUG" + settings.kext_debug = True settings.showpicker = False settings.sip_status = False settings.secure_status = True