From 896da79842f99eb7e285593104f8d6d313893f71 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Tue, 15 Jun 2021 13:55:21 +0000 Subject: [PATCH] Patch v12 to v13, before manual edits --- README.md | 147 +++++++++++++++++++++++++++++++++++ config-custom.plist | 81 ++++++++++--------- config-nopicker-custom.plist | 81 ++++++++++--------- 3 files changed, 239 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index f764aed..36c7c07 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,153 @@ In the case example of why these scripts were written is: # Special Update Notes +2021-06-15 - On June 15th 2021 we updated the config.plist from v12 to v13 via [@thenickdude](https://github.com/thenickdude)'s upstream `config.plist` files from [KVM-Opencore](https://github.com/thenickdude/KVM-Opencore). + + +```bash +wget https://github.com/thenickdude/KVM-Opencore/compare/v12...v13.patch + +patch -F 10 -p1 --verbose config-nopicker-custom.plist v12...v13.patch + +patch -F 10 -p1 --verbose config-custom.plist v12...v13.patch + +``` + +Rejected patch lines: +```patch +--- EFI/OC/config.plist ++++ EFI/OC/config.plist +@@ -644,43 +644,6 @@ + + Patch + +- +- Arch +- Any +- Base +- _cpu_topology_sort +- Comment +- algrey - cpu_topology_sort -disable _x86_validate_topology +- Count +- 1 +- Enabled +- +- Find +- +- 6AAA//8= +- +- Identifier +- kernel +- Limit +- 0 +- Mask +- +- /wAA//8= +- +- MaxKernel +- 20.99.99 +- MinKernel +- 17.0.0 +- Replace +- +- Dx9EAAA= +- +- ReplaceMask +- +- +- Skip +- 0 +- + + Arch + Any +@@ -922,17 +891,19 @@ + Arguments + + Auxiliary +- ++ + Comment + Memory testing utility + Enabled + ++ Flavour ++ MemTest + Name +- memcheck ++ memtest86 + Path +- memcheck/memcheck.efi ++ memtest86/BOOTX64.efi + RealPath +- ++ + TextMode + + +@@ -981,11 +954,13 @@ + boot-args + keepsyms=1 + csr-active-config +- AAAAAA== ++ Jg8= + prev-lang:kbd + ZW4tVVM6MA== + run-efi-updater + No ++ ForceDisplayRotationInEFI ++ 0 + + + Delete +--- Makefile ++++ Makefile +@@ -63,7 +63,7 @@ OpenCore-$(RELEASE_VERSION).iso : OpenCore-$(RELEASE_VERSION).dmg + + OpenCoreEFIFolder-$(RELEASE_VERSION).zip : Makefile $(EFI_FILES) + rm -f $@ +- zip -r $@ EFI ++ zip -X -r $@ EFI + + %.gz : % + gzip -f --keep $< +--- src/AppleALC ++++ src/AppleALC +@@ -1 +1 @@ +-Subproject commit 3c2f6315e6aed0cc3c45a9f01f84ef42fb497044 ++Subproject commit 93be275a4495a1bdb7ff2c3238053f66b9c5195d +--- src/Lilu ++++ src/Lilu +@@ -1 +1 @@ +-Subproject commit 5aeba9f98106a5a8a3057712b74e1608faf5e276 ++Subproject commit 614712caa9d84b6e90305839bd74f3872a44a522 +--- src/MacKernelSDK ++++ src/MacKernelSDK +@@ -1 +1 @@ +-Subproject commit 2b584e8e2081ed22fc619151518921c8636d4639 ++Subproject commit e73a6fcd42c94b6a908ad9fe197034c8f4bf442a +--- src/OcBinaryData ++++ src/OcBinaryData +@@ -1 +1 @@ +-Subproject commit ccf3d0c36784100293ccfb2865e10cd37f7a78ee ++Subproject commit 6dd2d92383edee522052ebbe2c634c92894b37e6 +--- src/OpenCorePkg ++++ src/OpenCorePkg +@@ -1 +1 @@ +-Subproject commit 5668fb62b50e8141d93ae6fce3e3fe238822f6ef ++Subproject commit ae515dd0b1efe79940ce94bfd235399ba873a3f0 +--- src/VirtualSMC ++++ src/VirtualSMC +@@ -1 +1 @@ +-Subproject commit 2a7455daf65c356c867a1d65b8f2520ae575ee3e ++Subproject commit 30a3fa2bd920a15e41ef1439585bcc19885b89e3 +--- src/WhateverGreen ++++ src/WhateverGreen +@@ -1 +1 @@ +-Subproject commit 1daa2563b5e6e40f195aba5dc006e14c1d55dfd6 ++Subproject commit 79efd986ac5f4f17e09b880f25ea45be64863b2f +``` + ----------------- diff --git a/config-custom.plist b/config-custom.plist index 03593cd..2e5e276 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -444,38 +444,6 @@ PlistPath Contents/Info.plist - - BundlePath - AGPMInjector.kext - Comment - - Enabled - - ExecutablePath - - MaxKernel - - MinKernel - - PlistPath - Contents/Info.plist - - - BundlePath - USBPorts.kext - Comment - - Enabled - - ExecutablePath - - MaxKernel - - MinKernel - - PlistPath - Contents/Info.plist - Arch x86_64 @@ -584,6 +552,38 @@ PlistPath Contents/Info.plist + + BundlePath + USBPorts.kext + Comment + + Enabled + + ExecutablePath + + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + + + BundlePath + AGPMInjector.kext + Comment + + Enabled + + ExecutablePath + + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + Block @@ -732,7 +732,7 @@ ////////AAAAAP// MaxKernel - 20.99.99 + 21.99.99 MinKernel 20.4.0 Replace @@ -790,6 +790,8 @@ KernelCache Auto + ProvideCurrentCpuInfo + Misc @@ -867,6 +869,8 @@ 0 SecureBootModel Disabled + AllowToggleSip + Vault Optional @@ -881,6 +885,8 @@ Not signed for security reasons Enabled + Flavour + OpenShell:UEFIShell:Shell Name UEFI Shell Path @@ -895,6 +901,8 @@ Perform shutdown Enabled + Flavour + Auto Name Shutdown Path @@ -946,6 +954,7 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 boot-args + ForceDisplayRotationInEFI LegacyEnable @@ -987,7 +996,7 @@ Generic - AdviseWindows + AdviseFeatures MLB {{BOARD_SERIAL}} @@ -1121,7 +1130,7 @@ AppleEvent AppleFramebufferInfo - + Disabled AppleImageConversion AppleImg4Verification @@ -1147,6 +1156,8 @@ OSInfo UnicodeCollation + AppleEg2Info + Quirks diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index bc7d99d..fbc6a7b 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -444,38 +444,6 @@ PlistPath Contents/Info.plist - - BundlePath - AGPMInjector.kext - Comment - - Enabled - - ExecutablePath - - MaxKernel - - MinKernel - - PlistPath - Contents/Info.plist - - - BundlePath - USBPorts.kext - Comment - - Enabled - - ExecutablePath - - MaxKernel - - MinKernel - - PlistPath - Contents/Info.plist - Arch x86_64 @@ -584,6 +552,38 @@ PlistPath Contents/Info.plist + + BundlePath + USBPorts.kext + Comment + + Enabled + + ExecutablePath + + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + + + BundlePath + AGPMInjector.kext + Comment + + Enabled + + ExecutablePath + + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + Block @@ -732,7 +732,7 @@ ////////AAAAAP// MaxKernel - 20.99.99 + 21.99.99 MinKernel 20.4.0 Replace @@ -790,6 +790,8 @@ KernelCache Auto + ProvideCurrentCpuInfo + Misc @@ -867,6 +869,8 @@ 0 SecureBootModel Disabled + AllowToggleSip + Vault Optional @@ -881,6 +885,8 @@ Not signed for security reasons Enabled + Flavour + OpenShell:UEFIShell:Shell Name UEFI Shell Path @@ -895,6 +901,8 @@ Perform shutdown Enabled + Flavour + Auto Name Shutdown Path @@ -946,6 +954,7 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 boot-args + ForceDisplayRotationInEFI LegacyEnable @@ -987,7 +996,7 @@ Generic - AdviseWindows + AdviseFeatures MLB {{BOARD_SERIAL}} @@ -1121,7 +1130,7 @@ AppleEvent AppleFramebufferInfo - + Disabled AppleImageConversion AppleImg4Verification @@ -1147,6 +1156,8 @@ OSInfo UnicodeCollation + AppleEg2Info + Quirks