From 66fdbe00b0c7ff8171471398f0bd2ef8b5240fdc Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Thu, 4 Mar 2021 08:42:00 -0700 Subject: [PATCH 1/4] Disable OpenRuntime.efi --- Resources/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/build.py b/Resources/build.py index dd5269758..0648f8320 100644 --- a/Resources/build.py +++ b/Resources/build.py @@ -190,7 +190,8 @@ class BuildOpenCore: print("- Adding OpenCanopy GUI") shutil.rmtree(self.constants.resources_path, onerror=rmtree_handler) shutil.copy(self.constants.gui_path, self.constants.oc_folder) - self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"] + #self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"] + self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi"] def set_smbios(self): spoofed_model = self.model From d78e5eaa90d67394fd524db0c93fb9afe22fb417 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Thu, 4 Mar 2021 08:44:55 -0700 Subject: [PATCH 2/4] Disable RequestBootVarRouting --- Resources/build.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/build.py b/Resources/build.py index 0648f8320..c76f13dad 100644 --- a/Resources/build.py +++ b/Resources/build.py @@ -192,6 +192,8 @@ class BuildOpenCore: shutil.copy(self.constants.gui_path, self.constants.oc_folder) #self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"] self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi"] + self.config["UEFI"]["Quirks"]["RequestBootVarRouting"] = False + def set_smbios(self): spoofed_model = self.model From 7c3557ec46349acfe60abc809714bc3b3cfd6fb4 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Thu, 4 Mar 2021 09:00:45 -0700 Subject: [PATCH 3/4] Swap for DiscardHibernateMap --- Resources/build.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/build.py b/Resources/build.py index c76f13dad..5ac10451f 100644 --- a/Resources/build.py +++ b/Resources/build.py @@ -190,9 +190,10 @@ class BuildOpenCore: print("- Adding OpenCanopy GUI") shutil.rmtree(self.constants.resources_path, onerror=rmtree_handler) shutil.copy(self.constants.gui_path, self.constants.oc_folder) - #self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"] - self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi"] - self.config["UEFI"]["Quirks"]["RequestBootVarRouting"] = False + self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"] + #self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi"] + #self.config["UEFI"]["Quirks"]["RequestBootVarRouting"] = False + self.config["Booter"]["Quirks"]["DiscardHibernateMap"] = True def set_smbios(self): From 31d31e1f3eeb4bf2a4977510af3db418c75d7319 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Thu, 4 Mar 2021 09:13:12 -0700 Subject: [PATCH 4/4] Clean up code --- CHANGELOG.md | 1 + Resources/build.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0521ccab1..0bce23070 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Add CPUFriend support to resolve X86PlatformPlugin clashes - (1.2.3 c388a62 release) - Fix crash with MacBookAir5,x +- Fix hibernation support ## 0.0.12 - Convert OpenCore-Patcher binary to OpenCore-Patcher.app diff --git a/Resources/build.py b/Resources/build.py index 5ac10451f..42ecaf19d 100644 --- a/Resources/build.py +++ b/Resources/build.py @@ -191,11 +191,9 @@ class BuildOpenCore: shutil.rmtree(self.constants.resources_path, onerror=rmtree_handler) shutil.copy(self.constants.gui_path, self.constants.oc_folder) self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"] - #self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi"] - #self.config["UEFI"]["Quirks"]["RequestBootVarRouting"] = False + # Hibernation Patch self.config["Booter"]["Quirks"]["DiscardHibernateMap"] = True - def set_smbios(self): spoofed_model = self.model # TODO: Set check as global variable