From 194de152cc7b355b5b5a7c4701c6c9e55f938deb Mon Sep 17 00:00:00 2001 From: stevezhengshiqi Date: Sat, 9 Mar 2024 03:18:39 -0500 Subject: [PATCH] makefile: Add AirportItlwm for Sonoma 14.4+, also change VoodooI2C build to download latest release * OC: Add AirportItlwm for Sonoma 14.4+ entry * Kext: Add AirportItlwm for Sonoma 14.4+ * download_kexts: Add AirportItlwm for Sonoma 14.4+ download * CI: Minor update * Docs: Update Changelog --- .github/workflows/main.yml | 6 ++-- Changelog.md | 16 +++++++++ Docs/Changelog_CN.md | 16 +++++++++ .../.gitkeep | 0 .../AirportItlwm_Sonoma144.kext}/.gitkeep | 0 .../KBL/AirportItlwm_Sonoma140.kext/.gitkeep | 0 .../KBL/AirportItlwm_Sonoma144.kext/.gitkeep | 0 Kexts/download_kexts.sh | 12 ++++--- OC/config_cml.plist | 24 ++++++++++++-- OC/config_kbl.plist | 24 ++++++++++++-- makefile.sh | 33 ++++++++++++++----- 11 files changed, 109 insertions(+), 22 deletions(-) rename Kexts/CML/{AirportItlwm_Sonoma.kext => AirportItlwm_Sonoma140.kext}/.gitkeep (100%) rename Kexts/{KBL/AirportItlwm_Sonoma.kext => CML/AirportItlwm_Sonoma144.kext}/.gitkeep (100%) create mode 100644 Kexts/KBL/AirportItlwm_Sonoma140.kext/.gitkeep create mode 100644 Kexts/KBL/AirportItlwm_Sonoma144.kext/.gitkeep diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4bc1bcc98..6923a12ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,14 +58,14 @@ jobs: analyze-scripts: name: Analyze Scripts runs-on: macos-latest + env: + HOMEBREW_NO_INSTALL_CLEANUP: 1 steps: - uses: actions/checkout@v4 - name: Install Dependency run: | brew install shellcheck - env: - HOMEBREW_NO_INSTALL_CLEANUP: 1 - name: Run shellcheck run: find . \( -name "*.tool" -o -name "*.command" -o -name "*.sh" \) -exec sh -c 'for TargetFile; do shellcheck --severity=info "${TargetFile}" || exit 1; done' sh {} + @@ -111,4 +111,4 @@ jobs: - name: Run ocvalidate run: | ./OpenCore/Utilities/ocvalidate/ocvalidate ./OC/config_kbl.plist || exit 1 - ./OpenCore/Utilities/ocvalidate/ocvalidate ./OC/config_cml.plist || exit 1 + ./OpenCore/Utilities/ocvalidate/ocvalidate ./OC/config_cml.plist || exit 1 \ No newline at end of file diff --git a/Changelog.md b/Changelog.md index 1ac1559e3..1722c8012 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,22 @@ **English** | [中文](Docs/Changelog_CN.md) +## [XiaoMi NoteBook Pro EFI v1.8.2](https://github.com/daliansky/XiaoMi-Pro-Hackintosh/releases/tag/v1.8.2) +## 2024-03-XX + +### Upgrade + - Update `OpenCore` v0.9.9 + - Update `Clover` r5157 + - Update `AppleALC` v1.8.9 + - Update `OcBinaryData` (up to [acidanthera/OcBinaryData@af09b0b](https://github.com/acidanthera/OcBinaryData/commit/af09b0bf763363ec9f4ecdbbe2f0adeb970948d8)) + - Update `IntelBluetoothFirmware` v2.5.0 (up to [OpenIntelWireless/IntelBluetoothFirmware@8b88140](https://github.com/OpenIntelWireless/IntelBluetoothFirmware/commit/8b88140dd09eb9810e49e57ee4aa06360cefa75c)) + - Update `AirportItlwm` v2.3.0 to support Sonoma 14.4+ (up to [OpenIntelWireless/itlwm@ef2e076](https://github.com/OpenIntelWireless/itlwm/commit/ef2e0762d1548b07bcab95570ae44e9bb6470933)) + - For Sonoma Verison < 14.4 with Clover user, [AirportItlwm-Sonoma14.0 kext](https://github.com/OpenIntelWireless/itlwm/releases) has to be manually downloaded and placed in `/EFI/CLOVER/kexts/14/`. `AirportItlwm_Sonoma144.kext` should also be deleted. + +### Clover + - config: Disable `ProvideConsoleGop` + + ## [XiaoMi NoteBook Pro EFI v1.8.1](https://github.com/daliansky/XiaoMi-Pro-Hackintosh/releases/tag/v1.8.1) ## 2023-11-06 diff --git a/Docs/Changelog_CN.md b/Docs/Changelog_CN.md index 64c4efc2e..803bb892f 100644 --- a/Docs/Changelog_CN.md +++ b/Docs/Changelog_CN.md @@ -2,6 +2,22 @@ [English](../Changelog.md) | **中文** +## [XiaoMi NoteBook Pro EFI v1.8.2](https://github.com/daliansky/XiaoMi-Pro-Hackintosh/releases/tag/v1.8.2) +## 2024-03-XX + +### 更新 + - 更新 `OpenCore` v0.9.9 + - 更新 `Clover` r5157 + - 更新 `AppleALC` v1.8.9 + - 更新 `OcBinaryData`（更新至 [acidanthera/OcBinaryData@af09b0b](https://github.com/acidanthera/OcBinaryData/commit/af09b0bf763363ec9f4ecdbbe2f0adeb970948d8)） + - 更新 `IntelBluetoothFirmware` v2.5.0（更新至 [OpenIntelWireless/IntelBluetoothFirmware@8b88140](https://github.com/OpenIntelWireless/IntelBluetoothFirmware/commit/8b88140dd09eb9810e49e57ee4aa06360cefa75c)） + - 更新 `AirportItlwm` v2.3.0 来支持 Sonoma 14.4+（更新至 [OpenIntelWireless/itlwm@ef2e076](https://github.com/OpenIntelWireless/itlwm/commit/ef2e0762d1548b07bcab95570ae44e9bb6470933)） + - 对于 Sonoma 版本 < 14.4 并使用 Clover 的用户，需要手动下载 [AirportItlwm-Sonoma14.0 kext](https://github.com/OpenIntelWireless/itlwm/releases) 并放置在 `/EFI/CLOVER/kexts/14/`。`AirportItlwm_Sonoma144.kext` 同时需要被删除。 + +### Clover + - config: 禁用 `ProvideConsoleGop` + + ## [XiaoMi NoteBook Pro EFI v1.8.1](https://github.com/daliansky/XiaoMi-Pro-Hackintosh/releases/tag/v1.8.1) ## 2023-11-06 diff --git a/Kexts/CML/AirportItlwm_Sonoma.kext/.gitkeep b/Kexts/CML/AirportItlwm_Sonoma140.kext/.gitkeep similarity index 100% rename from Kexts/CML/AirportItlwm_Sonoma.kext/.gitkeep rename to Kexts/CML/AirportItlwm_Sonoma140.kext/.gitkeep diff --git a/Kexts/KBL/AirportItlwm_Sonoma.kext/.gitkeep b/Kexts/CML/AirportItlwm_Sonoma144.kext/.gitkeep similarity index 100% rename from Kexts/KBL/AirportItlwm_Sonoma.kext/.gitkeep rename to Kexts/CML/AirportItlwm_Sonoma144.kext/.gitkeep diff --git a/Kexts/KBL/AirportItlwm_Sonoma140.kext/.gitkeep b/Kexts/KBL/AirportItlwm_Sonoma140.kext/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/Kexts/KBL/AirportItlwm_Sonoma144.kext/.gitkeep b/Kexts/KBL/AirportItlwm_Sonoma144.kext/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/Kexts/download_kexts.sh b/Kexts/download_kexts.sh index a3e324aaa..75e1ed948 100755 --- a/Kexts/download_kexts.sh +++ b/Kexts/download_kexts.sh @@ -90,7 +90,8 @@ function h_or_g() { hgs=( "grep -m 1 BigSur" "grep -m 1 Catalina" "grep -m 1 Monterey" - "grep -m 1 Sonoma" + "grep -m 1 Sonoma14.0" + "grep -m 1 Sonoma14.4" "grep -m 1 Ventura" ) elif [[ "$1" == "NoTouchID" ]]; then @@ -238,7 +239,8 @@ function unpack() { (cd "${OUTDir_TMP}" && unzip -qq -d "Big Sur" "*BigSur*.zip" && rm -- *BigSur*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") (cd "${OUTDir_TMP}" && unzip -qq -d "Catalina" "*Catalina*.zip" && rm -- *Catalina*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") (cd "${OUTDir_TMP}" && unzip -qq -d "Monterey" "*Monterey*.zip" && rm -- *Monterey*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") - (cd "${OUTDir_TMP}" && unzip -qq -d "Sonoma" "*Sonoma*.zip" && rm -- *Sonoma*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") + (cd "${OUTDir_TMP}" && unzip -qq -d "Sonoma14.0" "*Sonoma14.0*.zip" && rm -- *Sonoma14.0*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") + (cd "${OUTDir_TMP}" && unzip -qq -d "Sonoma14.4" "*Sonoma14.4*.zip" && rm -- *Sonoma14.4*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") (cd "${OUTDir_TMP}" && unzip -qq -d "Ventura" "*Ventura*.zip" && rm -- *Ventura*.zip || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!") eval "$(cd ${OUTDir_TMP} && unzip -qq "*.zip" || exit 1)" @@ -272,7 +274,8 @@ function patch() { mv "${OUTDir_TMP}/Big Sur/AirportItlwm.kext" "${OUTDir_TMP}/Big Sur/AirportItlwm_Big_Sur.kext" || exit 1 mv "${OUTDir_TMP}/Catalina/AirportItlwm.kext" "${OUTDir_TMP}/Catalina/AirportItlwm_Catalina.kext" || exit 1 mv "${OUTDir_TMP}/Monterey/AirportItlwm.kext" "${OUTDir_TMP}/Monterey/AirportItlwm_Monterey.kext" || exit 1 - mv "${OUTDir_TMP}/Sonoma/AirportItlwm.kext" "${OUTDir_TMP}/Sonoma/AirportItlwm_Sonoma.kext" || exit 1 + mv "${OUTDir_TMP}/Sonoma14.0/AirportItlwm.kext" "${OUTDir_TMP}/Sonoma14.0/AirportItlwm_Sonoma140.kext" || exit 1 + mv "${OUTDir_TMP}/Sonoma14.4/AirportItlwm.kext" "${OUTDir_TMP}/Sonoma14.4/AirportItlwm_Sonoma144.kext" || exit 1 mv "${OUTDir_TMP}/Ventura/AirportItlwm.kext" "${OUTDir_TMP}/Ventura/AirportItlwm_Ventura.kext" || exit 1 } @@ -303,7 +306,8 @@ function install() { "Big Sur/AirportItlwm_Big_Sur.kext" "Catalina/AirportItlwm_Catalina.kext" "Monterey/AirportItlwm_Monterey.kext" - "Sonoma/AirportItlwm_Sonoma.kext" + "Sonoma14.0/AirportItlwm_Sonoma140.kext" + "Sonoma14.4/AirportItlwm_Sonoma144.kext" "Ventura/AirportItlwm_Ventura.kext" ) diff --git a/OC/config_cml.plist b/OC/config_cml.plist index 24cbfe4c3..f7c37c368 100644 --- a/OC/config_cml.plist +++ b/OC/config_cml.plist @@ -889,20 +889,38 @@ Arch x86_64 BundlePath - AirportItlwm_Sonoma.kext + AirportItlwm_Sonoma140.kext Comment - Intel Wi-Fi driver on Sonoma + Intel Wi-Fi driver on Sonoma (from 14.0 to 14.3.1) Enabled ExecutablePath Contents/MacOS/AirportItlwm MaxKernel - 23.9.9 + 23.3.0 MinKernel 23.0.0 PlistPath Contents/Info.plist + + Arch + x86_64 + BundlePath + AirportItlwm_Sonoma144.kext + Comment + Intel Wi-Fi driver on Sonoma (from 14.4) + Enabled + + ExecutablePath + Contents/MacOS/AirportItlwm + MaxKernel + 23.9.9 + MinKernel + 23.4.0 + PlistPath + Contents/Info.plist + Arch x86_64 diff --git a/OC/config_kbl.plist b/OC/config_kbl.plist index 7711192b0..061e7ee73 100755 --- a/OC/config_kbl.plist +++ b/OC/config_kbl.plist @@ -904,20 +904,38 @@ Arch x86_64 BundlePath - AirportItlwm_Sonoma.kext + AirportItlwm_Sonoma140.kext Comment - Intel Wi-Fi driver on Sonoma + Intel Wi-Fi driver on Sonoma (from 14.0 to 14.3.1) Enabled ExecutablePath Contents/MacOS/AirportItlwm MaxKernel - 23.9.9 + 23.3.0 MinKernel 23.0.0 PlistPath Contents/Info.plist + + Arch + x86_64 + BundlePath + AirportItlwm_Sonoma144.kext + Comment + Intel Wi-Fi driver on Sonoma (from 14.4) + Enabled + + ExecutablePath + Contents/MacOS/AirportItlwm + MaxKernel + 23.9.9 + MinKernel + 23.4.0 + PlistPath + Contents/Info.plist + Arch x86_64 diff --git a/makefile.sh b/makefile.sh index a004b3cb5..fea2b2d07 100755 --- a/makefile.sh +++ b/makefile.sh @@ -220,6 +220,8 @@ function init() { "Catalina" "Monterey" "Sonoma" + "Sonoma14.0" + "Sonoma14.4" "Ventura" ) @@ -274,7 +276,8 @@ function h_or_g() { hgs=( "grep -m 1 BigSur" "grep -m 1 Catalina" "grep -m 1 Monterey" - "grep -m 1 Sonoma" + "grep -m 1 Sonoma14.0" + "grep -m 1 Sonoma14.4" "grep -m 1 Ventura" ) elif [[ "$1" == "NoTouchID" ]]; then @@ -545,6 +548,7 @@ function bKextHelper() { xcodebuild -scheme "AirportItlwm (all)" -configuration "$3" -derivedDataPath . > /dev/null 2>&1 || buildErr "$2" cp -R "${PATH_LONG_BIG}"* "../KBL" || copyErr + xcodebuild -scheme "AirportItlwm (all)" clean > /dev/null 2>&1 || buildErr "$2" fi fi cd ../ || exit 1 @@ -580,7 +584,11 @@ function bKext() { for oiwKext in "${oiwKexts[@]}"; do bKextHelper ${OIW} "${oiwKext}" "${build_mode}" done - bKextHelper VoodooI2C VoodooI2C + + # FIXME: Ref: https://github.com/daliansky/XiaoMi-Pro-Hackintosh/issues/732 + # bKextHelper VoodooI2C VoodooI2C + dGR VoodooI2C VoodooI2C + # Make sure Lilu is later than Lilu based kexts bKextHelper ${ACDT} "Lilu" "${build_mode}" echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: Please clean Xcode cache in ~/Library/Developer/Xcode/DerivedData!" @@ -661,7 +669,8 @@ function unpack() { unzip -qq -d "Big Sur" "*BigSur*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" unzip -qq -d "Catalina" "*Catalina*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" unzip -qq -d "Monterey" "*Monterey*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" - unzip -qq -d "Sonoma" "*Sonoma*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" + unzip -qq -d "Sonoma" "*Sonoma14.0*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" + unzip -qq -d "Sonoma" "*Sonoma14.4*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" unzip -qq -d "Ventura" "*Ventura*.zip" || echo "${yellow}[${bold} WARNING ${reset}${yellow}]${reset}: AirportItlwm has non-standard packages location!" fi ditto -x -k ./*.zip . || exit 1 @@ -709,14 +718,16 @@ function patch() { mv "${model}/Big Sur/AirportItlwm.kext" "${model}/Big Sur/AirportItlwm_Big_Sur.kext" || exit 1 mv "${model}/Catalina/AirportItlwm.kext" "${model}/Catalina/AirportItlwm_Catalina.kext" || exit 1 mv "${model}/Monterey/AirportItlwm.kext" "${model}/Monterey/AirportItlwm_Monterey.kext" || exit 1 - mv "${model}/Sonoma/AirportItlwm.kext" "${model}/Sonoma/AirportItlwm_Sonoma.kext" || exit 1 + mv "${model}/Sonoma14.0/AirportItlwm.kext" "${model}/Sonoma14.0/AirportItlwm_Sonoma140.kext" || exit 1 + mv "${model}/Sonoma14.4/AirportItlwm.kext" "${model}/Sonoma14.4/AirportItlwm_Sonoma144.kext" || exit 1 mv "${model}/Ventura/AirportItlwm.kext" "${model}/Ventura/AirportItlwm_Ventura.kext" || exit 1 done else mv "Big Sur/AirportItlwm.kext" "Big Sur/AirportItlwm_Big_Sur.kext" || exit 1 mv "Catalina/AirportItlwm.kext" "Catalina/AirportItlwm_Catalina.kext" || exit 1 mv "Monterey/AirportItlwm.kext" "Monterey/AirportItlwm_Monterey.kext" || exit 1 - mv "Sonoma/AirportItlwm.kext" "Sonoma/AirportItlwm_Sonoma.kext" || exit 1 + mv "Sonoma14.0/AirportItlwm.kext" "Sonoma14.0/AirportItlwm_Sonoma140.kext" || exit 1 + mv "Sonoma14.4/AirportItlwm.kext" "Sonoma14.4/AirportItlwm_Sonoma144.kext" || exit 1 mv "Ventura/AirportItlwm.kext" "Ventura/AirportItlwm_Ventura.kext" || exit 1 fi echo @@ -757,7 +768,8 @@ function install() { "Big Sur/AirportItlwm_Big_Sur.kext" "Catalina/AirportItlwm_Catalina.kext" "Monterey/AirportItlwm_Monterey.kext" - "Sonoma/AirportItlwm_Sonoma.kext" + "Sonoma14.0/AirportItlwm_Sonoma140.kext" + "Sonoma14.4/AirportItlwm_Sonoma144.kext" "Ventura/AirportItlwm_Ventura.kext" ) if [[ "${pre_release}" =~ "Kext" ]]; then @@ -794,7 +806,8 @@ function install() { "Big Sur/AirportItlwm_Big_Sur.kext" "Catalina/AirportItlwm_Catalina.kext" "Monterey/AirportItlwm_Monterey.kext" - "Sonoma/AirportItlwm_Sonoma.kext" + "Sonoma14.0/AirportItlwm_Sonoma140.kext" + "Sonoma14.4/AirportItlwm_Sonoma144.kext" "Ventura/AirportItlwm_Ventura.kext" ) if [[ "${pre_release}" =~ "Kext" ]]; then @@ -856,13 +869,15 @@ function install() { cp -R "${model}/Big Sur/AirportItlwm_Big_Sur.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/11/" || copyErr cp -R "${model}/Catalina/AirportItlwm_Catalina.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/10.15/" || copyErr cp -R "${model}/Monterey/AirportItlwm_Monterey.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/12/" || copyErr - cp -R "${model}/Sonoma/AirportItlwm_Sonoma.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/14/" || copyErr + # cp -R "${model}/Sonoma14.0/AirportItlwm_Sonoma140.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/14/" || copyErr + cp -R "${model}/Sonoma14.4/AirportItlwm_Sonoma144.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/14/" || copyErr cp -R "${model}/Ventura/AirportItlwm_Ventura.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/13/" || copyErr else cp -R "Big Sur/AirportItlwm_Big_Sur.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/11/" || copyErr cp -R "Catalina/AirportItlwm_Catalina.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/10.15/" || copyErr cp -R "Monterey/AirportItlwm_Monterey.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/12/" || copyErr - cp -R "Sonoma/AirportItlwm_Sonoma.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/14/" || copyErr + # cp -R "Sonoma14.0/AirportItlwm_Sonoma140.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/14/" || copyErr + cp -R "Sonoma14.4/AirportItlwm_Sonoma144.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/14/" || copyErr cp -R "Ventura/AirportItlwm_Ventura.kext" "${!OUTDir_MODEL_BL}/EFI/CLOVER/kexts/13/" || copyErr fi