From ba1ebebc5421210d86eed3927d0bd50fc3440af9 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 27 Jul 2022 10:34:50 -0600 Subject: [PATCH] smbios_data.py: Sync max OS support Ref: https://github.com/dortania/OpenCore-Legacy-Patcher/pull/999 --- data/smbios_data.py | 34 +++++++++++++++++----------------- payloads/OpenCore/clean.py | 4 +++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/data/smbios_data.py b/data/smbios_data.py index 9a657d992..6ac10b3c1 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -228,7 +228,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE13F", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, @@ -435,7 +435,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFF0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 11, @@ -452,7 +452,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFF0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, @@ -1113,7 +1113,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xEB0FF577", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.haswell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, @@ -1130,7 +1130,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xEB0FF577", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.haswell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, @@ -1149,7 +1149,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFD0FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, @@ -1166,7 +1166,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, @@ -1183,7 +1183,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, @@ -1200,7 +1200,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 15, @@ -1640,7 +1640,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xE00DE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.haswell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2258,7 +2258,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2275,7 +2275,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.broadwell.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2292,7 +2292,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2311,7 +2311,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2330,7 +2330,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xFC0FE137", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.skylake.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2635,7 +2635,7 @@ smbios_dictionary = { "FirmwareFeatures": "0xE90FF576", "SecureBootModel": None, "CPU Generation": cpu_data.cpu_data.ivy_bridge.value, - "Max OS Supported": os_data.os_data.max_os, + "Max OS Supported": os_data.os_data.monterey, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", @@ -2814,7 +2814,7 @@ smbios_dictionary = { # Apple Silicon Virtual Machine "Board ID": None, "FirmwareFeatures": None, - "SecureBootModel": "vma1macos", + "SecureBootModel": "vma1", "CPU Generation": cpu_data.cpu_data.apple_m1.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, diff --git a/payloads/OpenCore/clean.py b/payloads/OpenCore/clean.py index 3f47dc516..eedd49672 100755 --- a/payloads/OpenCore/clean.py +++ b/payloads/OpenCore/clean.py @@ -22,9 +22,11 @@ bad_drivers = [ "AudioDxe.efi", "BiosVideo.efi", "CrScreenshotDxe.efi", + "Ext4Dxe.efi", "HiiDatabase.efi", "NvmExpressDxe.efi", "OpenHfsPlus.efi", + "OpenNtfsDxe.efi", "OpenPartitionDxe.efi", "OpenUsbKbDxe.efi", "Ps2KeyboardDxe.efi", @@ -70,4 +72,4 @@ for version in build_types: print("- Renaming folder to OpenCore-Build and zipping") subprocess.run(f"mv ./OpenCore-{version} ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode() subprocess.run(f"zip -r ./OpenCore-{version}.zip ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode() - subprocess.run(f"rm -rf ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode() + subprocess.run(f"rm -rf ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode() \ No newline at end of file