Skip to content

Commit c3ba059

Browse files
authored
Merge pull request #784 from hnanoto/feature/ClearTaskSwitchBit
feat: Integrate ClearTaskSwitchBit Quirk & Sync OpenCorePkg
2 parents 23688b8 + 2cb8851 commit c3ba059

File tree

8 files changed

+34
-13
lines changed

8 files changed

+34
-13
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ jobs:
1717
contents: write
1818
steps:
1919
- uses: actions/checkout@v6
20+
with:
21+
submodules: recursive
2022

2123
- name: Manage Version
2224
run: |
23-
git fetch --prune --unshallow --tags
25+
git fetch --prune --unshallow --tags --no-recurse-submodules
2426
echo "CUR_TAG=$(git tag -l | tail -1)" >> $GITHUB_ENV
2527
echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
2628
@@ -30,6 +32,10 @@ jobs:
3032
HOMEBREW_NO_INSTALL_CLEANUP: 1
3133
HOMEBREW_NO_AUTO_UPDATE: 1
3234

35+
- name: Fix OpenCorePkg Macro
36+
run: |
37+
sed -i '' 's|///#define OC_PLATFORM_NVRAM_CONFIG_FIELDS|#define OC_PLATFORM_NVRAM_CONFIG_FIELDS|g' OpenCorePkg/Include/Acidanthera/Library/OcConfigurationLib.h
38+
3339
- name: Build Clover Pack
3440
run: |
3541
chmod +x ./buildme

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,9 @@ RELEASE_*/
6767
# Local debug files
6868
bin/
6969
DEBUG_REPORT.md
70+
71+
# Build logs
72+
*.log
73+
CloverPackage/*.log
74+
build_failure.log
75+
buildme_run.log

Clover.dsc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,11 +558,11 @@
558558
}
559559
OpenCorePkg/Library/OcVariableLib/OcVariableLib.inf {
560560
<BuildOptions>
561-
*_*_*_CC_FLAGS = $(OC_INCLUDE_FLAG)
561+
*_*_*_CC_FLAGS = $(OC_INCLUDE_FLAG) -Wno-error
562562
}
563563
OpenCorePkg/Library/OcMainLib/OcMainLibClover.inf {
564564
<BuildOptions>
565-
*_*_*_CC_FLAGS = $(OC_INCLUDE_FLAG)
565+
*_*_*_CC_FLAGS = $(OC_INCLUDE_FLAG) -Wno-error
566566
}
567567

568568

@@ -1050,7 +1050,7 @@ DEFINE BUILD_OPTIONS=-DIS_UEFI_MODULE -DMDEPKG_NDEBUG -DCLOVER_BUILD -DLESS_DEBU
10501050

10511051
XCODE:*_*_*_CC_FLAGS = -std=c11 -fno-unwind-tables $(BUILD_OPTIONS) $(XLTO_FLAG)
10521052
XCODE:*_*_*_CXX_FLAGS = -std=c++11 -fno-unwind-tables $(BUILD_OPTIONS) $(XLTO_FLAG)
1053-
GCC:*_*_*_CC_FLAGS = -std=c11 $(BUILD_OPTIONS) $(LTO_FLAG)
1054-
GCC:*_*_*_CXX_FLAGS = -std=c++11 $(BUILD_OPTIONS) $(LTO_FLAG)
1053+
GCC:*_*_*_CC_FLAGS = -std=c11 $(BUILD_OPTIONS) $(LTO_FLAG) -Wno-error
1054+
GCC:*_*_*_CXX_FLAGS = -std=c++11 $(BUILD_OPTIONS) $(LTO_FLAG) -Wno-error
10551055
#-fanalyzer -Wmismatched-tags
10561056
#-Weffc++

CloverPackage/package/po/clover.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Clover r5164\n"
10-
"POT-Creation-Date: 2025-11-07 20:08+0300\n"
9+
"Project-Id-Version: Clover r5166\n"
10+
"POT-Creation-Date: 2026-01-09 22:52-0300\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <[email protected]>\n"

rEFIt_UEFI/Platform/Settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2380,6 +2380,7 @@ class SETTINGS_DATA {
23802380
// XBool AppleXcpmCfgLock = false;
23812381
XBool AppleXcpmExtraMsrs = false;
23822382
XBool AppleXcpmForceBoost = false;
2383+
XBool ClearTaskSwitchBit = false;
23832384
// XBool CustomSmbiosGuid = false;
23842385
XBool DisableIoMapper = false;
23852386
XBool DisableIoMapperMapping = false;

rEFIt_UEFI/Settings/ConfigPlist/Config_Quirks.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class Quirks_Class : public XmlDict {
6565
public:
6666
XmlBool AppleXcpmExtraMsrs = XmlBool();
6767
XmlBool AppleXcpmForceBoost = XmlBool();
68+
XmlBool ClearTaskSwitchBit = XmlBool();
6869
XmlBool DisableIoMapper = XmlBool();
6970
XmlBool DisableIoMapperMapping = XmlBool();
7071
XmlBool DisableLinkeditJettison = XmlBool();
@@ -86,6 +87,10 @@ class Quirks_Class : public XmlDict {
8687
return AppleXcpmForceBoost.isDefined() ? AppleXcpmForceBoost.value()
8788
: AppleXcpmForceBoost.nullValue;
8889
};
90+
XBool dgetClearTaskSwitchBit() const {
91+
return ClearTaskSwitchBit.isDefined() ? ClearTaskSwitchBit.value()
92+
: ClearTaskSwitchBit.nullValue;
93+
};
8994
XBool dgetDisableIoMapper() const {
9095
return DisableIoMapper.isDefined() ? DisableIoMapper.value()
9196
: DisableIoMapper.nullValue;
@@ -281,7 +286,7 @@ class Quirks_Class : public XmlDict {
281286
OcKernelQuirks_Class OcKernelQuirks;
282287
OcBooterQuirks_Class OcBooterQuirks;
283288

284-
XmlDictField m_fields[38] = {
289+
XmlDictField m_fields[39] = {
285290
{"AvoidRuntimeDefrag", OcBooterQuirks.AvoidRuntimeDefrag},
286291
{"DevirtualiseMmio", OcBooterQuirks.DevirtualiseMmio},
287292
{"DisableSingleUser", OcBooterQuirks.DisableSingleUser},
@@ -308,6 +313,7 @@ class Quirks_Class : public XmlDict {
308313
{"KernelCache", KernelCache},
309314
{"AppleXcpmExtraMsrs", OcKernelQuirks.AppleXcpmExtraMsrs},
310315
{"AppleXcpmForceBoost", OcKernelQuirks.AppleXcpmForceBoost},
316+
{"ClearTaskSwitchBit", OcKernelQuirks.ClearTaskSwitchBit},
311317
{"DisableIoMapper", OcKernelQuirks.DisableIoMapper},
312318
{"DisableIoMapperMapping", OcKernelQuirks.DisableIoMapperMapping},
313319
{"DisableLinkeditJettison", OcKernelQuirks.DisableLinkeditJettison},

rEFIt_UEFI/refit/main.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,10 +833,10 @@ void debugStartImageWithOC() {
833833
XStringW devicePathToLookFor;
834834
// devicePathToLookFor.takeValueFrom("PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/HD(4,GPT,CA224585-830E-4274-5826-1ACB6DA08A4E,0x299F000,0x4AE6310)/VenMedia(BE74FCF7-0B7C-49F3-9147-01F4042E6842,1ABE434C8D0357398516CFDF0A9DD7EF)");
835835
// // Jief High Sierra DevicePath
836-
devicePathToLookFor
837-
.takeValueFrom("PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/"
838-
"HD(2,GPT,D8C7DA82-1E4C-4579-BA7C-6737A5D43464,0x64028,"
839-
"0x1BF08E8)"); // Jief Big Sur Install device path
836+
devicePathToLookFor.takeValueFrom(
837+
"PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/"
838+
"HD(2,GPT,D8C7DA82-1E4C-4579-BA7C-6737A5D43464,0x64028,"
839+
"0x1BF08E8)"); // Jief Big Sur Install device path
840840
UINTN HandleCount = 0;
841841
EFI_HANDLE *Handles = NULL;
842842
Status =
@@ -1303,6 +1303,8 @@ void LOADER_ENTRY::StartLoader() {
13031303
gSettings.Quirks.OcKernelQuirks.AppleXcpmExtraMsrs;
13041304
mOpenCoreConfiguration.Kernel.Quirks.AppleXcpmForceBoost =
13051305
gSettings.Quirks.OcKernelQuirks.AppleXcpmForceBoost;
1306+
mOpenCoreConfiguration.Kernel.Quirks.ClearTaskSwitchBit =
1307+
gSettings.Quirks.OcKernelQuirks.ClearTaskSwitchBit;
13061308
#ifndef USE_OC_SECTION_PlatformInfo
13071309
mOpenCoreConfiguration.Kernel.Quirks.CustomSmbiosGuid =
13081310
gSettings.KernelAndKextPatches.KPDELLSMBIOS;

0 commit comments

Comments
 (0)