MatchBuild absent should means allowed

Signed-off-by: SergeySlice <[email protected]>
CloverHackyColor · Dec 24, 2021 · 62ad226 · 62ad226
1 parent 16aba10
commit 62ad226
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Clover.dsc b/Clover.dsc
@@ -971,7 +971,11 @@ DEFINE EXIT_USBKB_FLAG = -DEXIT_USBKB
 DEFINE JIEF_DEBUG_FLAG = -DJIEF_DEBUG
 !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_*_*_CXX_FLAGS = 

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

diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp
@@ -462,7 +462,7 @@ void LOADER_ENTRY::FilterKernelPatches()
         KernelAndKextPatches.KernelPatches[i].Label.c_str(),
         macOSVersion.asString().c_str(),
         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) {
         KernelAndKextPatches.KernelPatches[i].MenuItem.BValue = false;
@@ -492,7 +492,7 @@ void LOADER_ENTRY::FilterBootPatches()
           KernelAndKextPatches.BootPatches[i].Label.c_str(),
           macOSVersion.asString().c_str(),
           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) {
         DBG(" ==> disabled by user\n");