timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-06-20 22:20:53 +10:00
Code Issues Packages Projects Releases Wiki Activity

sys_patch_dict.py: Deduplicate TS1/TS2 patch sets

Browse Source
This commit is contained in:
Mykola Grymalyuk
2022-05-03 20:12:41 -06:00
parent c23e391990
commit 35031d8fa2
2 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/sys_patch_dict.py
+19 -22
View File
@@ -9,7 +9,7 @@
# - Processes: Additional processes to run - Array of strings # - Processes: Additional processes to run - Array of strings
# File Storage is based off the origin, ie. '10.13.6/System/Library/Extensions/IOSurface.kext' # File Storage is based off the origin, ie. '10.13.6/System/Library/Extensions/IOSurface.kext'
# Stubbed binaries are OS specific, this use the 'os' variable to denounce which folder to use # Stubbed binaries are OS specific, this use the 'os_major' variable to denounce which folder to use
from data import os_data from data import os_data
@@ -140,23 +140,14 @@ def SystemPatchDictionary(os_major):
}, },
}, },
}, },
"AMD TeraScale 1": { "AMD Non-Metal Common": {
"Install": { "Install": {
"/System/Library/Extensions": { "/System/Library/Extensions": {
"AMD2400Controller.kext": "10.13.6",
"AMD2600Controller.kext": "10.13.6",
"AMD3800Controller.kext": "10.13.6",
"AMD4600Controller.kext": "10.13.6",
"AMD4800Controller.kext": "10.13.6",
"AMDFramebuffer.kext": "10.13.6", "AMDFramebuffer.kext": "10.13.6",
"AMDLegacyFramebuffer.kext": "10.13.6", "AMDLegacyFramebuffer.kext": "10.13.6",
"AMDLegacySupport.kext": "10.13.6", "AMDLegacySupport.kext": "10.13.6",
"AMDShared.bundle": "10.13.6", "AMDShared.bundle": "10.13.6",
"AMDSupport.kext": "10.13.6", "AMDSupport.kext": "10.13.6",
"ATIRadeonX2000.kext": "10.13.6",
"ATIRadeonX2000GA.plugin": "10.13.6",
"ATIRadeonX2000GLDriver.bundle": "10.13.6",
"ATIRadeonX2000VADriver.bundle": "10.13.6",
}, },
}, },
"Remove": { "Remove": {
@@ -169,20 +160,31 @@ def SystemPatchDictionary(os_major):
], ],
}, },
}, },
"AMD TeraScale 1": {
"Install": {
"/System/Library/Extensions": {
"AMD2400Controller.kext": "10.13.6",
"AMD2600Controller.kext": "10.13.6",
"AMD3800Controller.kext": "10.13.6",
"AMD4600Controller.kext": "10.13.6",
"AMD4800Controller.kext": "10.13.6",
"ATIRadeonX2000.kext": "10.13.6",
"ATIRadeonX2000GA.plugin": "10.13.6",
"ATIRadeonX2000GLDriver.bundle": "10.13.6",
"ATIRadeonX2000VADriver.bundle": "10.13.6",
},
},
},
"AMD TeraScale 2": { "AMD TeraScale 2": {
"Install": { "Install": {
"/System/Library/Extensions": { "/System/Library/Extensions": {
"AMD5000Controller.kext": "10.13.6", "AMD5000Controller.kext": "10.13.6",
"AMD6000Controller.kext": "10.13.6", "AMD6000Controller.kext": "10.13.6",
"AMDFramebuffer.kext": "10.13.6",
"AMDLegacyFramebuffer.kext": "10.13.6",
"AMDLegacySupport.kext": "10.13.6",
"AMDRadeonVADriver.bundle": "10.13.6", "AMDRadeonVADriver.bundle": "10.13.6",
"AMDRadeonVADriver2.bundle": "10.13.6", "AMDRadeonVADriver2.bundle": "10.13.6",
"AMDRadeonX3000.kext": "10.13.6", "AMDRadeonX3000.kext": "10.13.6",
"AMDRadeonX3000GLDriver.bundle": "10.13.6", "AMDRadeonX3000GLDriver.bundle": "10.13.6",
"AMDShared.bundle": "10.13.6",
"AMDSupport.kext": "10.13.6",
"IOAcceleratorFamily2.kext": "10.13.6", "IOAcceleratorFamily2.kext": "10.13.6",
"IOSurface.kext": "10.14.6", "IOSurface.kext": "10.14.6",
}, },
@@ -197,12 +199,7 @@ def SystemPatchDictionary(os_major):
}, },
"Remove": { "Remove": {
"/System/Library/Extensions": { "/System/Library/Extensions": {
"AppleCameraInterface.kext", # Specific to IOAccelerator downgrade "AppleCameraInterface.kext",
"AMD7000Controller.kext",
"AMD8000Controller.kext",
"AMD9000Controller.kext",
"AMD9500Controller.kext",
"AMD10000Controller.kext",
}, },
}, },
}, },
resources/sys_patch.py
+23 -31
View File
@@ -274,10 +274,12 @@ class PatchSysVolume:
if self.amd_ts1 is True: if self.amd_ts1 is True:
print(" - Adding AMD TeraScale 1 Graphics Patchset") print(" - Adding AMD TeraScale 1 Graphics Patchset")
required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]}) required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]})
required_patches.update({"AMD Non-Metal Common": all_hardware_patchset["Graphics"]["AMD Non-Metal Common"]})
required_patches.update({"AMD TeraScale 1": all_hardware_patchset["Graphics"]["AMD TeraScale 1"]}) required_patches.update({"AMD TeraScale 1": all_hardware_patchset["Graphics"]["AMD TeraScale 1"]})
if self.amd_ts2 is True: if self.amd_ts2 is True:
print(" - Adding AMD TeraScale 2 Graphics Patchset") print(" - Adding AMD TeraScale 2 Graphics Patchset")
required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]}) required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]})
required_patches.update({"AMD Non-Metal Common": all_hardware_patchset["Graphics"]["AMD Non-Metal Common"]})
required_patches.update({"AMD TeraScale 2": all_hardware_patchset["Graphics"]["AMD TeraScale 2"]}) required_patches.update({"AMD TeraScale 2": all_hardware_patchset["Graphics"]["AMD TeraScale 2"]})
if self.brightness_legacy is True: if self.brightness_legacy is True:
print(" - Adding Legacy Brightness Patchset") print(" - Adding Legacy Brightness Patchset")
@@ -313,21 +315,18 @@ class PatchSysVolume:
destination_folder_path = str(self.mount_location) + remove_patch_directory destination_folder_path = str(self.mount_location) + remove_patch_directory
self.remove_file(destination_folder_path, remove_patch_file) self.remove_file(destination_folder_path, remove_patch_file)
if "Install" in required_patches[patch]:
for install_patch_directory in required_patches[patch]["Install"]: for method_install in ["Install", "Install Non-Root"]:
print(f"- Handling Installs in: {install_patch_directory}") if method_install in required_patches[patch]:
for install_file in required_patches[patch]["Install"][install_patch_directory]: for install_patch_directory in required_patches[patch][method_install]:
source_folder_path = source_files_path + "/" + required_patches[patch]['Install'][install_patch_directory][install_file] + install_patch_directory print(f"- Handling Installs in: {install_patch_directory}")
destination_folder_path = str(self.mount_location) + install_patch_directory for install_file in required_patches[patch][method_install][install_patch_directory]:
self.install_new_file(source_folder_path, destination_folder_path, install_file) source_folder_path = source_files_path + "/" + required_patches[patch][method_install][install_patch_directory][install_file] + install_patch_directory
if method_install == "Install":
if "Install Non-Root" in required_patches[patch]: destination_folder_path = str(self.mount_location) + install_patch_directory
for install_patch_directory in required_patches[patch]["Install Non-Root"]: else:
print(f"- Handling Non-Root Installs in: {install_patch_directory}") destination_folder_path = str(self.mount_location_data) + install_patch_directory
for install_file in required_patches[patch]["Install Non-Root"][install_patch_directory]: self.install_new_file(source_folder_path, destination_folder_path, install_file)
source_folder_path = source_files_path + "/" + required_patches[patch]['Install Non-Root'][install_patch_directory][install_file] + install_patch_directory
destination_folder_path = str(self.mount_location_data) + install_patch_directory
self.install_new_file(source_folder_path, destination_folder_path, install_file)
if "Processes" in required_patches[patch]: if "Processes" in required_patches[patch]:
for process in required_patches[patch]["Processes"]: for process in required_patches[patch]["Processes"]:
@@ -370,22 +369,15 @@ class PatchSysVolume:
raise Exception("Failed to find AppleIntelSNBGraphicsFB.kext, cannot patch!!!") raise Exception("Failed to find AppleIntelSNBGraphicsFB.kext, cannot patch!!!")
# Check all the files are present # Check all the files are present
for patch in required_patches: for patch in required_patches:
if "Install" in required_patches[patch]: for method_type in ["Install", "Install Non-Root"]:
for install_patch_directory in required_patches[patch]["Install"]: if method_type in required_patches[patch]:
for install_file in required_patches[patch]["Install"][install_patch_directory]: for install_patch_directory in required_patches[patch][method_type]:
source_file = source_files_path + "/" + required_patches[patch]['Install'][install_patch_directory][install_file] + install_patch_directory + "/" + install_file for install_file in required_patches[patch][method_type][install_patch_directory]:
if not Path(source_file).exists: source_file = source_files_path + "/" + required_patches[patch][method_type][install_patch_directory][install_file] + install_patch_directory + "/" + install_file
raise Exception(f"Failed to find {source_file}") if not Path(source_file).exists:
raise Exception(f"Failed to find {source_file}")
if "Install Non-Root" in required_patches[patch]:
for install_patch_directory in required_patches[patch]["Install Non-Root"]:
print(f"- Handling Non-Root Installs in: {install_patch_directory}")
for install_file in required_patches[patch]["Install Non-Root"][install_patch_directory]:
source_file = source_files_path + "/" + required_patches[patch]['Install Non-Root'][install_patch_directory][install_file] + install_patch_directory + "/" + install_file
if not Path(source_file).exists:
raise Exception(f"Failed to find {source_file}")
print("- Finished Preflight, starting patching") print("- Finished Preflight, starting patching")
def install_new_file(self, source_folder, destination_folder, file_name): def install_new_file(self, source_folder, destination_folder, file_name):