diff --git a/OpenCore-Patcher.command b/OpenCore-Patcher.command index f71a593ca..212713f9c 100755 --- a/OpenCore-Patcher.command +++ b/OpenCore-Patcher.command @@ -40,7 +40,7 @@ while MainMenu: print(" Your model is not supported by this patcher!") print("") print(" If you plan to create the USB for another machine,") - print(" please select option 5") + print(" please select option 3") print(subheader) print("") elif BuildOpenCore.current_model in ("MacPro3,1", "iMac7,1"): @@ -110,7 +110,7 @@ while MainMenu: print("\n Not Valid Choice Try again") OpenCoreBuilderMenu = True - + elif MainMenu=="2": print("\n Not yet implemented") OpenCoreInstallerMenu=True @@ -202,8 +202,7 @@ while MainMenu: elif MainMenu=="5": print("\n Closing program...") - sys.exit(1) + sys.exit(1) else: print("\n Not Valid Choice Try again") MainMenu=True - diff --git a/Resources/BuildOpenCore.py b/Resources/BuildOpenCore.py index 5d9ae1b61..88ea56520 100644 --- a/Resources/BuildOpenCore.py +++ b/Resources/BuildOpenCore.py @@ -37,14 +37,14 @@ else: OCExist = False def BuildEFI(): - + if not os.path.exists(Versions.build_path): os.makedirs(Versions.build_path) print("Created Build Folder") else: print("Build Folder already present, skipping") # Copy OpenCore into Build Folder - + if os.path.exists(Versions.opencore_path_build): print("Deleting old copy of OpenCore zip") os.remove(Versions.opencore_path_build) @@ -64,7 +64,7 @@ def BuildEFI(): # Adding must have kexts print("- Adding Lilu v%s" % Versions.lilu_version) copy(Versions.lilu_path, Versions.kext_path_build) - + print("- Adding WhateverGreen v%s" % Versions.whatevergreen_version) copy(Versions.whatevergreen_path, Versions.kext_path_build) @@ -75,7 +75,7 @@ def BuildEFI(): "", "" ) - + # Checks for kexts # CPU Kext Patches if current_model in ModelArray.DualSocket: @@ -85,7 +85,7 @@ def BuildEFI(): "", "" ) - + if current_model in ModelArray.SSEEmulator: print("- Adding AAAMouSSE v%s" % Versions.mousse_version) copy(Versions.mousse_path, Versions.kext_path_build) @@ -100,7 +100,7 @@ def BuildEFI(): "", "" ) - + # Ethernet Patches if current_model in ModelArray.EthernetNvidia: @@ -124,7 +124,7 @@ def BuildEFI(): "", "" ) - + # Wifi Patches if current_model in ModelArray.WifiAtheros: @@ -211,7 +211,7 @@ def BuildEFI(): "", "" ) - + if current_model in ModelArray.LegacyAudio: print("- Adding VoodooHDA v%s" % Versions.voodoohda_version) copy(Versions.voodoohda_path, Versions.kext_path_build) @@ -219,7 +219,7 @@ def BuildEFI(): "", "" ) - + if current_model in ModelArray.pciSSDT: print("- Adding SSDT-CPBG") copy(Versions.pci_ssdt_path, Versions.acpi_path_build) @@ -227,7 +227,7 @@ def BuildEFI(): "", "" ) - + if current_model in ModelArray.IDEPatch: print("- Adding AppleIntelPIIXATA v%s" % Versions.piixata_version) copy(Versions.piixata_path, Versions.kext_path_build) @@ -235,7 +235,7 @@ def BuildEFI(): "", "" ) - + usb_map_path = os.path.join(Versions.current_path, "payloads/Kexts/Maps/Zip/" "USB-Map-%s.zip" % current_model) if os.path.exists(usb_map_path): print("- Adding USB Map for %s" % current_model) @@ -249,7 +249,7 @@ def BuildEFI(): "USB-Map-SMBIOS.kext", map_name ) - + if current_model in ModelArray.DualGPUPatch: print("- Adding dual GPU patch") Versions.plist_data = Versions.plist_data.replace( @@ -327,7 +327,7 @@ def BuildSMBIOS(): "M0000000000000001", serialData[1] ) - + # Patch UUID uuidGen = subprocess.Popen(["uuidgen"], stdout=subprocess.PIPE).communicate()[0] Versions.plist_data = Versions.plist_data.replace( @@ -389,7 +389,7 @@ def MoveOpenCore(): print("") efiVol = "/Volumes/EFI" if os.path.exists(efiVol): - print("Coping OpenCore onto Volumes/EFI") + print("Copying OpenCore onto Volumes/EFI") if os.path.exists("/Volumes/EFI/EFI"): print("Cleaning EFI folder") rmtree("/Volumes/EFI/EFI") @@ -404,4 +404,4 @@ def MoveOpenCore(): print("") def MountOpenCore(): - subprocess.Popen((r"sudo diskutil mount $(nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:boot-path | sed 's/.*GPT,\([^,]*\),.*/\1/')").split()) \ No newline at end of file + subprocess.Popen((r"sudo diskutil mount $(nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:boot-path | sed 's/.*GPT,\([^,]*\),.*/\1/')").split()) diff --git a/Resources/Versions.py b/Resources/Versions.py index feb554d81..9388cb492 100644 --- a/Resources/Versions.py +++ b/Resources/Versions.py @@ -11,7 +11,7 @@ import subprocess import sys # List build versions -opencore_version = "0.6.6" +opencore_version = "0.6.7" lilu_version = "1.5.1" whatevergreen_version = "1.4.7" airportbcrmfixup_version = "2.1.2" @@ -76,4 +76,4 @@ macserial_path = os.path.join(current_path, "payloads/" "Tools") # Icons app_icon_path = os.path.join(current_path, "OC-Patcher.icns") icon_path = os.path.join(current_path, "payloads/Icon/" ".VolumeIcon.icns") -gui_path = os.path.join(current_path, "payloads/Icon/" "Resources.zip") \ No newline at end of file +gui_path = os.path.join(current_path, "payloads/Icon/" "Resources.zip") diff --git a/payloads/Config/v0.6.7/config.plist b/payloads/Config/v0.6.7/config.plist new file mode 100644 index 000000000..5b634ddc5 --- /dev/null +++ b/payloads/Config/v0.6.7/config.plist @@ -0,0 +1,1000 @@ + + + + + + ACPI + + Add + + + Enabled + + Comment + Patch CPBG for Arrendale, Lynnfield and Clarkdale + Path + SSDT-CPBG.aml + + + Delete + + Patch + + + Comment + XHC1 to SHC1 + Count + 0 + Enabled + + Find + WEhDMQ== + Limit + 0 + Mask + + OemTableId + + Replace + U0hDMQ== + ReplaceMask + + Skip + 0 + TableLength + 0 + TableSignature + + + + Comment + EHC1 to EH01 + Count + 0 + Enabled + + Find + RUhDMQ== + Limit + 0 + Mask + + OemTableId + + Replace + RUgwMQ== + ReplaceMask + + Skip + 0 + TableLength + 0 + TableSignature + + + + Comment + EHC2 to EH02 + Count + 0 + Enabled + + Find + RUhDMg== + Limit + 0 + Mask + + OemTableId + + Replace + RUgwMg== + ReplaceMask + + Skip + 0 + TableLength + 0 + TableSignature + + + + Quirks + + FadtEnableReset + + NormalizeHeaders + + RebaseRegions + + ResetHwSig + + ResetLogoStatus + + + + Booter + + MmioWhitelist + + Patch + + + Quirks + + AllowRelocationBlock + + AvoidRuntimeDefrag + + DevirtualiseMmio + + DisableSingleUser + + DisableVariableWrite + + DiscardHibernateMap + + EnableSafeModeSlide + + EnableWriteUnprotector + + ForceExitBootServices + + ProtectMemoryRegions + + ProtectSecureBoot + + ProtectUefiServices + + ProvideCustomSlide + + ProvideMaxSlide + 0 + RebuildAppleMemoryMap + + SetupVirtualMap + + SignalAppleOS + + SyncRuntimePermissions + + + + DeviceProperties + + Add + + #PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0) + + device-id + ukMAAA== + compatible + pci14e4,43ba + + + Delete + + + Kernel + + Add + + + Arch + x86_64 + Comment + Patching Engine + Enabled + + MaxKernel + + MinKernel + + BundlePath + Lilu.kext + ExecutablePath + Contents/MacOS/Lilu + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + GPU Patching + Enabled + + MaxKernel + + MinKernel + + BundlePath + WhateverGreen.kext + ExecutablePath + Contents/MacOS/WhateverGreen + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Process Blocker + Enabled + + MaxKernel + + MinKernel + + BundlePath + RestrictEvents.kext + ExecutablePath + Contents/MacOS/RestrictEvents + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + SSE Emulator + Enabled + + MaxKernel + + MinKernel + 18.0.0 + BundlePath + AAAMouSSE.kext + ExecutablePath + Contents/MacOS/MouSSE + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + SSE Patcher + Enabled + + MaxKernel + + MinKernel + 18.0.0 + BundlePath + telemetrap.kext + ExecutablePath + Contents/MacOS/telemetrap + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + 4331 Wifi Patch + Enabled + + MaxKernel + + MinKernel + 20.0.0 + BundlePath + AirportBrcmFixup.kext + ExecutablePath + Contents/MacOS/AirportBrcmFixup + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + 4331 Wifi Patch + Enabled + + MaxKernel + + MinKernel + 20.0.0 + BundlePath + AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext + ExecutablePath + + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Dual Socket Patch + Enabled + + MaxKernel + + MinKernel + 19.0.0 + BundlePath + AppleMCEReporterDisabler.kext + ExecutablePath + + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + BCM Ethernet patch + Enabled + + MaxKernel + + MinKernel + 20.0.0 + BundlePath + CatalinaBCM5701Ethernet.kext + ExecutablePath + Contents/MacOS/CatalinaBCM5701Ethernet + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Atheros Wifi Patch + Enabled + + MaxKernel + + MinKernel + 18.0.0 + BundlePath + IO80211HighSierra.kext + ExecutablePath + Contents/MacOS/IO80211HighSierra + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Atheros Wifi Patch + Enabled + + MaxKernel + + MinKernel + 18.0.0 + BundlePath + IO80211HighSierra.kext/Contents/PlugIns/AirPortAtheros40.kext + ExecutablePath + Contents/MacOS/AirPortAtheros40 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Broadcom Wifi Patch + Enabled + + MaxKernel + + MinKernel + 19.0.0 + BundlePath + IO80211Mojave.kext + ExecutablePath + Contents/MacOS/IO80211Mojave + PlistPath + Contents/Info.plist + + + Comment + Broadcom Wifi Patch + Enabled + + MaxKernel + + MinKernel + 19.0.0 + BundlePath + IO80211Mojave.kext/Contents/PlugIns/AirPortBrcm4331.kext + ExecutablePath + Contents/MacOS/AirPortBrcm4331 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Marvel Ethernet Patch + Enabled + + MaxKernel + + MinKernel + 19.0.0 + BundlePath + MarvelYukonEthernet.kext + ExecutablePath + Contents/MacOS/MarvelYukonEthernet + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + Nvidia Ethernet Patch + Enabled + + MaxKernel + + MinKernel + 19.0.0 + BundlePath + nForceEthernet.kext + ExecutablePath + Contents/MacOS/nForceEthernet + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + VoodooHDA + Enabled + + MaxKernel + + MinKernel + 18.0.0 + BundlePath + VoodooHDA.kext + ExecutablePath + Contents/MacOS/VoodooHDA + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + AppleIntelPIIXATA + Enabled + + MaxKernel + + MinKernel + 20.0.0 + BundlePath + AppleIntelPIIXATA.kext + ExecutablePath + Contents/MacOS/AppleIntelPIIXATA + PlistPath + Contents/Info.plist + + + Arch + x86_64 + Comment + USB Map + Enabled + + MaxKernel + + MinKernel + + BundlePath + USB-Map-SMBIOS.kext + ExecutablePath + + PlistPath + Contents/Info.plist + + + Block + + Emulate + + DummyPowerManagement + + Cpuid1Data + + Cpuid1Mask + + MaxKernel + + MinKernel + + + Force + + Patch + + + Arch + x86_64 + Base + _isSingleUser + Comment + Patch IOHIDFamily + Count + 1 + Enabled + + Find + + Identifier + com.apple.iokit.IOHIDFamily + Limit + 0 + Mask + + MaxKernel + + MinKernel + 20.0.0 + Replace + uAEAAADD + ReplaceMask + + Skip + 0 + + + Quirks + + AppleCpuPmCfgLock + + AppleXcpmCfgLock + + AppleXcpmExtraMsrs + + AppleXcpmForceBoost + + CustomSMBIOSGuid + + DisableIoMapper + + DisableLinkeditJettison + + DisableRtcChecksum + + ExtendBTFeatureFlags + + ExternalDiskIcons + + ForceSecureBootScheme + + IncreasePciBarSize + + LapicKernelPanic + + LegacyCommpage + + PanicNoKextDump + + PowerTimeoutKernelPanic + + SetApfsTrimTimeout + -1 + ThirdPartyDrives + + XhciPortLimit + + + Scheme + + FuzzyMatch + + KernelArch + x86_64 + KernelCache + Auto + + + Misc + + BlessOverride + + Boot + + ConsoleAttributes + 0 + HibernateMode + Auto + HideAuxiliary + + LauncherPath + Default + LauncherOption + Full + PickerAttributes + 17 + PickerAudioAssist + + PickerMode + External + PickerVariant + Modern + PollAppleHotKeys + + ShowPicker + + TakeoffDelay + 0 + Timeout + 5 + + Debug + + AppleDebug + + ApplePanic + + DisableWatchDog + + DisplayDelay + 0 + DisplayLevel + 2147483650 + SerialInit + + SysReport + + Target + 3 + + Entries + + Security + + AllowNvramReset + + AllowSetDefault + + ApECID + 0 + AuthRestart + + BlacklistAppleUpdate + + DmgLoading + Signed + EnablePassword + + ExposeSensitiveData + 15 + HaltLevel + 2147483648 + PasswordHash + + PasswordSalt + + ScanPolicy + 0 + SecureBootModel + j137 + Vault + Optional + + Tools + + + Arguments + + Auxiliary + + Name + BootKicker.efi + Comment + BootKicker.efi + Enabled + + Path + BootKicker.efi + RealPath + + TextMode + + + + Arguments + + Auxiliary + + Name + OpenShell.efi + Comment + OpenShell.efi + Enabled + + Path + OpenShell.efi + RealPath + + TextMode + + + + + NVRAM + + Add + + 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14 + + DefaultBackgroundColor + AAAAAA== + UIScale + AQ== + + 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102 + + rtc-blacklist + + + 7C436110-AB2A-4BBB-A880-FE41995C9F82 + + SystemAudioVolume + Rg== + boot-args + -v keepsyms=1 debug=0x100 + run-efi-updater + No + csr-active-config + AAAAAA== + + + Delete + + 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14 + + UIScale + DefaultBackgroundColor + + 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102 + + rtc-blacklist + + 7C436110-AB2A-4BBB-A880-FE41995C9F82 + + boot-args + + + LegacyEnable + + LegacyOverwrite + + LegacySchema + + 7C436110-AB2A-4BBB-A880-FE41995C9F82 + + EFILoginHiDPI + EFIBluetoothDelay + LocationServicesEnabled + SystemAudioVolume + SystemAudioVolumeDB + SystemAudioVolumeSaved + bluetoothActiveControllerInfo + bluetoothInternalControllerInfo + flagstate + fmm-computer-name + nvda_drv + prev-lang:kbd + + 8BE4DF61-93CA-11D2-AA0D-00E098032B8C + + Boot0080 + Boot0081 + Boot0082 + BootNext + BootOrder + + + WriteFlash + + + PlatformInfo + + Automatic + + CustomMemory + + Generic + + AdviseWindows + + SystemMemoryStatus + Auto + MaxBIOSVersion + + MLB + M0000000000000001 + ProcessorType + 0 + ROM + ESIzRFVm + SpoofVendor + + SystemProductName + iMac19,1 + SystemSerialNumber + W00000000001 + SystemUUID + 00000000-0000-0000-0000-000000000000 + + UpdateDataHub + + UpdateNVRAM + + UpdateSMBIOS + + UpdateSMBIOSMode + Create + UseRawUuidEncoding + + + UEFI + + APFS + + EnableJumpstart + + GlobalConnect + + HideVerbose + + JumpstartHotPlug + + MinDate + 0 + MinVersion + 0 + + Audio + + AudioCodec + 0 + AudioDevice + PciRoot(0x0)/Pci(0x1b,0x0) + AudioOut + 0 + AudioSupport + + MinimumVolume + 20 + PlayChime + Disabled + SetupDelay + 0 + VolumeAmplifier + 0 + + ConnectDrivers + + Drivers + + #NvmExpressDxe.efi + #OpenCanopy.efi + OpenRuntime.efi + + Input + + KeyFiltering + + KeyForgetThreshold + 5 + KeyMergeThreshold + 2 + KeySupport + + KeySupportMode + Auto + KeySwap + + PointerSupport + + PointerSupportMode + ASUS + TimerResolution + 50000 + + Output + + ClearScreenOnModeSwitch + + ConsoleMode + + DirectGopRendering + + ForceResolution + + IgnoreTextInGraphics + + ProvideConsoleGop + + ReconnectOnResChange + + ReplaceTabWithSpace + + Resolution + Max + SanitiseClearScreen + + TextRenderer + BuiltinGraphics + UgaPassThrough + + + ProtocolOverrides + + AppleAudio + + AppleBootPolicy + + AppleDebugLog + + AppleEvent + + AppleFramebufferInfo + + AppleImageConversion + + AppleImg4Verification + + AppleKeyMap + + AppleRtcRam + + AppleSecureBoot + + AppleSmcIo + + AppleUserInterfaceTheme + + DataHub + + DeviceProperties + + FirmwareVolume + + HashServices + + OSInfo + + UnicodeCollation + + + Quirks + + DisableSecurityPolicy + + ExitBootServicesDelay + 0 + IgnoreInvalidFlexRatio + + ReleaseUsbOwnership + + RequestBootVarRouting + + TscSyncTimeout + 0 + UnblockFsConnect + + + ReservedMemory + + + + diff --git a/payloads/OpenCore/OpenCore-v0.6.7.zip b/payloads/OpenCore/OpenCore-v0.6.7.zip new file mode 100644 index 000000000..515252472 Binary files /dev/null and b/payloads/OpenCore/OpenCore-v0.6.7.zip differ