Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-10 09:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

MatchBuild absent should means allowed

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2021-12-24 21:22:53 +03:00
parent 16aba10098
commit 62ad226e21
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Clover.dsc
View File

@ -971,7 +971,11 @@ DEFINE EXIT_USBKB_FLAG = -DEXIT_USBKB
DEFINE JIEF_DEBUG_FLAG = -DJIEF_DEBUG DEFINE JIEF_DEBUG_FLAG = -DJIEF_DEBUG
!endif !endif
DEFINE BUILD_OPTIONS=-DIS_UEFI_MODULE -DMDEPKG_NDEBUG -DCLOVER_BUILD $(VBIOS_PATCH_CLOVEREFI_FLAG) $(ONLY_SATA_0_FLAG) $(BLOCKIO_FLAG) $(NOUSB_FLAG) $(NOUDMA_FLAG) $(AMD_FLAG) $(SECURE_BOOT_FLAG) $(ANDX86_FLAG) $(PS2MOUSE_LEGACYBOOT_FLAG) $(DEBUG_ON_SERIAL_PORT_FLAG) $(EXIT_USBKB_FLAG) $(JIEF_DEBUG_FLAG) -DDISABLE_NEW_DEPRECATED_INTERFACES -DOC_TARGET_DEBUG !ifdef LESS_DEBUG
DEFINE LESS_DEBUG_FLAG = -DLESS_DEBUG
!endif
DEFINE BUILD_OPTIONS=-DIS_UEFI_MODULE -DMDEPKG_NDEBUG -DCLOVER_BUILD -DLESS_DEBUG $(VBIOS_PATCH_CLOVEREFI_FLAG) $(ONLY_SATA_0_FLAG) $(BLOCKIO_FLAG) $(NOUSB_FLAG) $(NOUDMA_FLAG) $(AMD_FLAG) $(SECURE_BOOT_FLAG) $(ANDX86_FLAG) $(PS2MOUSE_LEGACYBOOT_FLAG) $(DEBUG_ON_SERIAL_PORT_FLAG) $(EXIT_USBKB_FLAG) $(JIEF_DEBUG_FLAG) -DDISABLE_NEW_DEPRECATED_INTERFACES -DOC_TARGET_DEBUG
XCODE:DEBUG_*_*_CC_FLAGS = XCODE:DEBUG_*_*_CC_FLAGS =
XCODE:DEBUG_*_*_CXX_FLAGS = XCODE:DEBUG_*_*_CXX_FLAGS =

2
OpenCorePkg

@ -1 +1 @@
Subproject commit 4bb89121670bea8830c3c8b7a4429fbfa5c104ff Subproject commit f0926840864a5538782e53eae465c3c409dfbb8e

2
rEFIt_UEFI/Platform/KERNEL_AND_KEXT_PATCHES.cpp
View File

@ -25,6 +25,7 @@ XBool ABSTRACT_PATCH::IsPatchEnabledByBuildNumber(const XString8& Build)
for (size_t i = 0; i < mos.size(); ++i) { for (size_t i = 0; i < mos.size(); ++i) {
// dot represent MatchOS // dot represent MatchOS
MacOsVersion mosv = mos[i]; MacOsVersion mosv = mos[i];
MsgLog("\n check matchBuild %s\n", mos[i].c_str());
if ( mos[i].contains(Build) ) { // MatchBuild if ( mos[i].contains(Build) ) { // MatchBuild
//DBG("\nthis patch will activated for OS %ls!\n", mos->array[i]); //DBG("\nthis patch will activated for OS %ls!\n", mos->array[i]);
ret = true; ret = true;
@ -52,6 +53,7 @@ XBool ABSTRACT_PATCH::IsPatchEnabled(const MacOsVersion& CurrOS)
for (size_t i = 0; i < mos.size(); ++i) { for (size_t i = 0; i < mos.size(); ++i) {
// dot represent MatchOS // dot represent MatchOS
MacOsVersion mosv = mos[i]; MacOsVersion mosv = mos[i];
MsgLog("\n check MatchOS %s\n", mos[i].c_str());
if ( CurrOS.match(mos[i]) ) { if ( CurrOS.match(mos[i]) ) {
//DBG("\nthis patch will activated for OS %ls!\n", mos->array[i]); //DBG("\nthis patch will activated for OS %ls!\n", mos->array[i]);
ret = true; ret = true;

4
rEFIt_UEFI/refit/main.cpp
View File

@ -462,7 +462,7 @@ void LOADER_ENTRY::FilterKernelPatches()
KernelAndKextPatches.KernelPatches[i].Label.c_str(), KernelAndKextPatches.KernelPatches[i].Label.c_str(),
macOSVersion.asString().c_str(), macOSVersion.asString().c_str(),
KernelAndKextPatches.KernelPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.KernelPatches[i].MatchOS.c_str() : "All", KernelAndKextPatches.KernelPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.KernelPatches[i].MatchOS.c_str() : "All",
KernelAndKextPatches.KernelPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.KernelPatches[i].MatchBuild.c_str() : "no" KernelAndKextPatches.KernelPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.KernelPatches[i].MatchBuild.c_str() : "All"
); );
if (!gSettings.KernelAndKextPatches.KernelPatches[i].MenuItem.BValue) { if (!gSettings.KernelAndKextPatches.KernelPatches[i].MenuItem.BValue) {
KernelAndKextPatches.KernelPatches[i].MenuItem.BValue = false; KernelAndKextPatches.KernelPatches[i].MenuItem.BValue = false;
@ -492,7 +492,7 @@ void LOADER_ENTRY::FilterBootPatches()
KernelAndKextPatches.BootPatches[i].Label.c_str(), KernelAndKextPatches.BootPatches[i].Label.c_str(),
macOSVersion.asString().c_str(), macOSVersion.asString().c_str(),
KernelAndKextPatches.BootPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.BootPatches[i].MatchOS.c_str() : "All", KernelAndKextPatches.BootPatches[i].MatchOS.notEmpty() ? KernelAndKextPatches.BootPatches[i].MatchOS.c_str() : "All",
KernelAndKextPatches.BootPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.BootPatches[i].MatchBuild.c_str() : "no" KernelAndKextPatches.BootPatches[i].MatchBuild.notEmpty() ? KernelAndKextPatches.BootPatches[i].MatchBuild.c_str() : "All"
); );
if (!gSettings.KernelAndKextPatches.BootPatches[i].MenuItem.BValue) { if (!gSettings.KernelAndKextPatches.BootPatches[i].MenuItem.BValue) {
DBG(" ==> disabled by user\n"); DBG(" ==> disabled by user\n");