From ab9c93a1da1031f25df307e51f964639dc6b07c3 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 4 Oct 2022 09:53:14 -0600 Subject: [PATCH] sys_patch_helpers: Write KDK used to patchset plist --- resources/sys_patch.py | 2 +- resources/sys_patch_helpers.py | 9 +++++++-- resources/validation.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/sys_patch.py b/resources/sys_patch.py index 0e13c4eb0..446baff94 100644 --- a/resources/sys_patch.py +++ b/resources/sys_patch.py @@ -348,7 +348,7 @@ class PatchSysVolume: destination_path = f"{self.mount_location}/System/Library/CoreServices" file_name = "OpenCore-Legacy-Patcher.plist" destination_path_file = f"{destination_path}/{file_name}" - if sys_patch_helpers.sys_patch_helpers(self.constants).generate_patchset_plist(patchset, file_name): + if sys_patch_helpers.sys_patch_helpers(self.constants).generate_patchset_plist(patchset, file_name, self.kdk_path): print("- Writing patchset information to Root Volume") if Path(destination_path_file).exists(): utilities.process_status(utilities.elevated(["rm", destination_path_file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)) diff --git a/resources/sys_patch_helpers.py b/resources/sys_patch_helpers.py index 858c2c849..9fa0a396f 100644 --- a/resources/sys_patch_helpers.py +++ b/resources/sys_patch_helpers.py @@ -51,15 +51,20 @@ class sys_patch_helpers: raise Exception("Failed to find AppleIntelSNBGraphicsFB.kext, cannot patch!!!") - def generate_patchset_plist(self, patchset, file_name): + def generate_patchset_plist(self, patchset, file_name, kdk_used): source_path = f"{self.constants.payload_path}" source_path_file = f"{source_path}/{file_name}" + kdk_string = "Not applicable" + if kdk_used: + kdk_string = kdk_used + data = { "OpenCore Legacy Patcher": f"v{self.constants.patcher_version}", "PatcherSupportPkg": f"v{self.constants.patcher_support_pkg_version}", "Time Patched": f"{datetime.now().strftime('%B %d, %Y @ %H:%M:%S')}", - "Commit URL": f"{self.constants.commit_info[2]}" + "Commit URL": f"{self.constants.commit_info[2]}", + "Kernel Debug Kit Used": f"{kdk_string}", } data.update(patchset) if Path(source_path_file).exists(): diff --git a/resources/validation.py b/resources/validation.py index de7e09e46..97f7f3301 100644 --- a/resources/validation.py +++ b/resources/validation.py @@ -81,7 +81,7 @@ def validate(settings): raise Exception(f"Failed to find {source_file}") print(f"- Validating against Darwin {major_kernel}.{minor_kernel}") - if not sys_patch_helpers.sys_patch_helpers(settings).generate_patchset_plist(patchset, f"OpenCore-Legacy-Patcher-{major_kernel}.{minor_kernel}.plist"): + if not sys_patch_helpers.sys_patch_helpers(settings).generate_patchset_plist(patchset, f"OpenCore-Legacy-Patcher-{major_kernel}.{minor_kernel}.plist", None): raise Exception("Failed to generate patchset plist") # Remove the plist file after validation