makefile: Add AirportItlwm for Sonoma 14.4+, also change VoodooI2C bu…

…ild 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

@@ -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

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
 

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
 

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"
   )
 

OC/config_cml.plist

@@ -889,20 +889,38 @@
 				<key>Arch</key>
 				<string>x86_64</string>
 				<key>BundlePath</key>
-				<string>AirportItlwm_Sonoma.kext</string>
+				<string>AirportItlwm_Sonoma140.kext</string>
 				<key>Comment</key>
-				<string>Intel Wi-Fi driver on Sonoma</string>
+				<string>Intel Wi-Fi driver on Sonoma (from 14.0 to 14.3.1)</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AirportItlwm</string>
 				<key>MaxKernel</key>
-				<string>23.9.9</string>
+				<string>23.3.0</string>
 				<key>MinKernel</key>
 				<string>23.0.0</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AirportItlwm_Sonoma144.kext</string>
+				<key>Comment</key>
+				<string>Intel Wi-Fi driver on Sonoma (from 14.4)</string>
+				<key>Enabled</key>
+				<true/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AirportItlwm</string>
+				<key>MaxKernel</key>
+				<string>23.9.9</string>
+				<key>MinKernel</key>
+				<string>23.4.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>

OC/config_kbl.plist

@@ -904,20 +904,38 @@
 				<key>Arch</key>
 				<string>x86_64</string>
 				<key>BundlePath</key>
-				<string>AirportItlwm_Sonoma.kext</string>
+				<string>AirportItlwm_Sonoma140.kext</string>
 				<key>Comment</key>
-				<string>Intel Wi-Fi driver on Sonoma</string>
+				<string>Intel Wi-Fi driver on Sonoma (from 14.0 to 14.3.1)</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AirportItlwm</string>
 				<key>MaxKernel</key>
-				<string>23.9.9</string>
+				<string>23.3.0</string>
 				<key>MinKernel</key>
 				<string>23.0.0</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AirportItlwm_Sonoma144.kext</string>
+				<key>Comment</key>
+				<string>Intel Wi-Fi driver on Sonoma (from 14.4)</string>
+				<key>Enabled</key>
+				<true/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AirportItlwm</string>
+				<key>MaxKernel</key>
+				<string>23.9.9</string>
+				<key>MinKernel</key>
+				<string>23.4.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>

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