Fix pythong 3.8 support and XhciDxe

Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/240
This commit is contained in:
Mykola Grymalyuk
2021-05-23 11:37:48 -06:00
parent 98bc71e46a
commit 8e1809cf3d
2 changed files with 4 additions and 4 deletions

View File

@@ -489,7 +489,7 @@ class BuildOpenCore:
print("- Adding OpenCanopy GUI") print("- Adding OpenCanopy GUI")
shutil.rmtree(self.constants.resources_path, onerror=rmtree_handler) shutil.rmtree(self.constants.resources_path, onerror=rmtree_handler)
shutil.copy(self.constants.gui_path, self.constants.oc_folder) 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"]
# Exfat check # Exfat check
if self.model in ModelArray.NoExFat: if self.model in ModelArray.NoExFat:
print("- Adding ExFatDxeLegacy.efi") print("- Adding ExFatDxeLegacy.efi")

View File

@@ -36,7 +36,7 @@ class PatchSysVolume:
self.mount_lauchd = f"{self.mount_location}/System/Library/LaunchDaemons" self.mount_lauchd = f"{self.mount_location}/System/Library/LaunchDaemons"
self.mount_private_frameworks = f"{self.mount_location}/System/Library/PrivateFrameworks" self.mount_private_frameworks = f"{self.mount_location}/System/Library/PrivateFrameworks"
def elevated(self, *args, **kwargs) -> subprocess.CompletedProcess[Any]: def elevated(self, *args, **kwargs) -> subprocess.CompletedProcess([Any], returncode=0):
if os.getuid() == 0: if os.getuid() == 0:
return subprocess.run(*args, **kwargs) return subprocess.run(*args, **kwargs)
else: else:
@@ -54,7 +54,7 @@ class PatchSysVolume:
if print_status is True: if print_status is True:
print(f"- {current_sip_bit}\t {temp}") print(f"- {current_sip_bit}\t {temp}")
i = i + 1 i = i + 1
sip_needs_change = all( sip_needs_change = all(
self.constants.csr_values[i] self.constants.csr_values[i]
for i in [ for i in [
@@ -178,7 +178,7 @@ class PatchSysVolume:
else: else:
if self.constants.recovery_status is True: if self.constants.recovery_status is True:
print("- Mounting drive as writable in Recovery") print("- Mounting drive as writable in Recovery")
umount_drive = plistlib.loads(subprocess.run(f"diskutil info -plist {self.root_mount_path}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()) umount_drive = plistlib.loads(subprocess.run(f"diskutil info -plist {self.root_mount_path}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
umount_drive = umount_drive["VolumeName"] umount_drive = umount_drive["VolumeName"]
self.elevated(["umount", f'/Volumes/{umount_drive}'], stdout=subprocess.PIPE).stdout.decode().strip().encode() self.elevated(["umount", f'/Volumes/{umount_drive}'], stdout=subprocess.PIPE).stdout.decode().strip().encode()