diff --git a/payloads/Kexts/Misc/latebloom-v0.22.zip b/payloads/Kexts/Misc/latebloom-v0.22.zip deleted file mode 100644 index f2b32f990..000000000 Binary files a/payloads/Kexts/Misc/latebloom-v0.22.zip and /dev/null differ diff --git a/payloads/Kexts/Wifi/IO80211HighSierra-v1.0.1.zip b/payloads/Kexts/Wifi/IO80211HighSierra-v1.0.1.zip deleted file mode 100644 index 3c47a2fa3..000000000 Binary files a/payloads/Kexts/Wifi/IO80211HighSierra-v1.0.1.zip and /dev/null differ diff --git a/payloads/Kexts/Wifi/IO80211Mojave-v1.0.1.zip b/payloads/Kexts/Wifi/IO80211Mojave-v1.0.1.zip deleted file mode 100644 index 43175891b..000000000 Binary files a/payloads/Kexts/Wifi/IO80211Mojave-v1.0.1.zip and /dev/null differ diff --git a/resources/arguments.py b/resources/arguments.py index 8fd276d97..1ac16b9a7 100644 --- a/resources/arguments.py +++ b/resources/arguments.py @@ -10,7 +10,9 @@ class arguments: self.args = utilities.check_cli_args() def parse_arguments(self, settings): - if not self.args.auto_patch: + if self.args.validate: + validation.validate(settings) + elif self.args.build: if self.args.model: if self.args.model: print(f"- Using custom model: {self.args.model}") @@ -30,8 +32,6 @@ class arguments: if self.args.disk: print(f"- Install Disk set: {self.args.disk}") settings.disk = self.args.disk - if self.args.validate: - validation.validate(settings) if self.args.verbose: print("- Set verbose configuration") settings.verbose_debug = True @@ -95,9 +95,6 @@ class arguments: print("- Building for natively supported model") settings.allow_oc_everywhere = True settings.serial_settings = "None" - - # Avoid running the root patcher if we're just building - if self.args.build: build.BuildOpenCore(settings.custom_model or settings.computer.real_model, settings).build_opencore() elif self.args.patch_sys_vol: print("- Set System Volume patching") diff --git a/resources/cli_menu.py b/resources/cli_menu.py index 136bc2866..268dab031 100644 --- a/resources/cli_menu.py +++ b/resources/cli_menu.py @@ -573,51 +573,6 @@ Note 2: This setting only affects iMac13,x with dGPUs else: self.allow_ivy() - def latebloom_settings(self): - utilities.cls() - utilities.header(["Set latebloom properties"]) - print( - f""" -Set latebloom properties, useful for debugging boot stalls on -pre-Sandy Bridge Macs. - -Valid options: - -1. Set delay (currently: {self.constants.latebloom_delay}ms) -2. Set range (currently: {self.constants.latebloom_range}ms) -3. Set debug (currently: {bool(self.constants.latebloom_debug)}) -Q. Return to previous menu - """ - ) - - change_menu = input("Select latebloom property(1/2/3): ") - if change_menu == "1": - try: - self.constants.latebloom_delay = int(input("Set delay: ")) - except ValueError: - input("Invalid value, press [ENTER] to continue") - self.latebloom_settings() - elif change_menu == "2": - try: - self.constants.latebloom_range = int(input("Set range: ")) - except ValueError: - input("Invalid value, press [ENTER] to continue") - self.latebloom_settings() - elif change_menu == "3": - try: - print("Currently supports either 0(False) or 1(True)") - latebloom_debug = int(input("Set debug(0/1): ")) - if latebloom_debug not in [0, 1]: - input("Invalid value, press [ENTER] to continue") - else: - self.constants.latebloom_debug = latebloom_debug - except ValueError: - input("Invalid value, press [ENTER] to continue") - self.latebloom_settings() - elif change_menu in {"q", "Q", "Quit", "quit"}: - print("Returning to previous menu") - else: - self.latebloom_settings() def disable_tb(self): utilities.cls() diff --git a/resources/constants.py b/resources/constants.py index 67ff3620a..2413407ef 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -63,8 +63,6 @@ class Constants: self.i210_version = "1.0.0" # CatalinaIntelI210Ethernet self.corecaptureelcap_version = "1.0.1" # corecaptureElCap self.io80211elcap_version = "2.0.0" # IO80211ElCap - self.io80211high_sierra_version = "1.0.1" # IO80211HighSierra - self.io80211mojave_version = "1.0.1" # IO80211Mojave self.bigsursdxc_version = "1.0.0" # BigSurSDXC ## Dortania @@ -78,7 +76,6 @@ class Constants: ## Syncretic ## https://forums.macrumors.com/members/syncretic.1173816/ ## https://github.com/reenigneorcim/latebloom - self.latebloom_version = "0.22" # Latebloom self.mousse_version = "0.95" # MouSSE self.telemetrap_version = "1.0.0" # telemetrap @@ -141,12 +138,6 @@ class Constants: self.fu_status = True # Enable FeatureUnlock self.fu_arguments = None # Set FeatureUnlock arguments - ## Latebloom Settings - self.latebloom_status = False # Latebloom Enabled - self.latebloom_delay = 0 # Delay between each PCIe Probe - self.latebloom_range = 0 # Range each delay can differ - self.latebloom_debug = 0 # Debug Setting - ## Security Settings self.apecid_support = False # ApECID self.amfi_status = True # Apple Mobile File Integrity @@ -328,14 +319,6 @@ class Constants: def io80211elcap_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211ElCap-v{self.io80211elcap_version}.zip") - @property - def io80211high_sierra_path(self): - return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip") - - @property - def io80211mojave_path(self): - return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip") - @property def applealc_path(self): return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}-{self.kext_variant}.zip") @@ -400,10 +383,6 @@ class Constants: def gpu_wake_path(self): return self.payload_kexts_path / Path(f"Misc/AMDGPUWakeHandler-v{self.gpu_wake_version}.zip") - @property - def latebloom_path(self): - return self.payload_kexts_path / Path(f"Misc/latebloom-v{self.latebloom_version}.zip") - @property def apple_trackpad_path(self): return self.payload_kexts_path / Path(f"Misc/AppleUSBTrackpad-v{self.apple_trackpad}.zip")