From 992184e1346f70e7f980e83515da015cd719ab4c Mon Sep 17 00:00:00 2001 From: stevezhengshiqi Date: Mon, 17 May 2021 18:26:09 +0800 Subject: [PATCH] CI: Remove CPV check * download_kext.sh: Use Sniki's CodecCommander * OC: Update config to support https://github.com/acidanthera/OpenCorePkg/commit/985b24d196ec2b1cf7a6be752fc1733bb3e7ed49 --- .github/workflows/main.yml | 22 ---------------------- CLOVER/config_cml.plist | 2 +- Changelog.md | 2 ++ Docs/Changelog_CN.md | 2 ++ Kexts/download_kexts.sh | 15 ++++++--------- OC/config_cml.plist | 2 +- OC/config_kbl.plist | 2 +- 7 files changed, 13 insertions(+), 34 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e486ba18..206b58fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,28 +80,6 @@ jobs: run: | find . -name '*.dsl' -exec sh -c './iasl* -vw 2095 -vw 2173 -vs -p "${1%/*}/../${1##*/}" "${1%}" && echo || exit 1' sh {} \; - analyze-clover-config: - name: Analyze Clover Configs - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - - name: Install Dependency - run: | - mkdir "CloverConfigPlistValidator" && cd "CloverConfigPlistValidator" || exit 1 - hg="grep -m 1 CloverConfigPlistValidator" - rawURL="https://github.com/CloverHackyColor/CloverBootloader/releases/latest" - url="https://github.com$(curl -L --silent "${rawURL}" | grep '/download/' | eval "${hg}" | sed 's/^[^"]*"\([^"]*\)".*/\1/')" - echo "Downloading ${url##*\/}" - curl -# -L -O "${url}" || exit 1 - unzip -qq "*.zip" || exit 1 - chmod +x CloverConfigPlistValidator || exit 1 - - - name: Run CloverConfigPlistValidator - run: | - ./CloverConfigPlistValidator/CloverConfigPlistValidator ./CLOVER/config_kbl.plist || exit 1 - ./CloverConfigPlistValidator/CloverConfigPlistValidator ./CLOVER/config_cml.plist || exit 1 - analyze-oc-config: name: Analyze OpenCore Configs runs-on: macos-latest diff --git a/CLOVER/config_cml.plist b/CLOVER/config_cml.plist index 5d51a925..029c6b22 100644 --- a/CLOVER/config_cml.plist +++ b/CLOVER/config_cml.plist @@ -331,7 +331,7 @@ SystemParameters InjectKexts - Yes + InjectSystemID diff --git a/Changelog.md b/Changelog.md index 1d831f8a..2bf36488 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,8 @@ - Update `Clover` r5135 - Update `AppleALC` v1.6.1 - Update `VirtualSMC` v1.2.4 + - Update `AirportItlwm` v2.0.0 (up to ) + - Update `IntelBluetoothFirmware` v1.1.3 (up to ) - Update `RestrictEvents` v1.0.2 - Update `ExFatDxe.efi` (up to [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235)) - Update `HfsPlus.efi` (up to [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235)) diff --git a/Docs/Changelog_CN.md b/Docs/Changelog_CN.md index d167bb20..891d4984 100644 --- a/Docs/Changelog_CN.md +++ b/Docs/Changelog_CN.md @@ -10,6 +10,8 @@ * 更新 `Clover` r5135 * 更新 `AppleALC` v1.6.1 * 更新 `VirtualSMC` v1.2.4 + * 更新 `AirportItlwm` v2.0.0（更新至） + * 更新 `IntelBluetoothFirmware` v1.1.3（更新至） * 更新 `RestrictEvents` v1.0.2 * 更新 `ExFatDxe.efi`（更新至 [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235)） * 更新 `HfsPlus.efi`（更新至 [acidanthera/OcBinaryData@95b7d4c](https://github.com/acidanthera/OcBinaryData/commit/95b7d4ccb9fea6af48641fc1f5bd4b57f747b235)） diff --git a/Kexts/download_kexts.sh b/Kexts/download_kexts.sh index 0b3dde57..324e2661 100755 --- a/Kexts/download_kexts.sh +++ b/Kexts/download_kexts.sh @@ -70,6 +70,8 @@ function init() { function h_or_g() { if [[ "$1" == "VoodooI2C" ]]; then hgs=( "head -n 1" ) + elif [[ "$1" == "EAPD-Codec-Commander" ]]; then + hgs=( "grep -m 2 CodecCommander | grep -m 1 RELEASE" ) elif [[ "$1" == "IntelBluetoothFirmware" ]]; then hgs=( "grep -m 1 IntelBluetooth" ) elif [[ "$1" == "itlwm" ]]; then @@ -180,11 +182,6 @@ function dBR() { } function download() { - local rmKexts=( - os-x-eapd-codec-commander - os-x-null-ethernet - ) - local acdtKexts=( VirtualSMC WhateverGreen @@ -200,9 +197,7 @@ function download() { itlwm ) - for rmKext in "${rmKexts[@]}"; do - dBR Rehabman "${rmKext}" "${OUTDir_TMP}" - done + dBR Rehabman os-x-null-ethernet "${OUTDir_TMP}" for acdtKext in "${acdtKexts[@]}"; do dGR ${ACDT} "${acdtKext}" NULL "${OUTDir_TMP}" @@ -212,6 +207,8 @@ function download() { dGR ${OIW} "${oiwKext}" PreRelease "${OUTDir_TMP}" done + dGR Sniki EAPD-Codec-Commander NULL "${OUTDir_TMP}" + dGR VoodooI2C VoodooI2C NULL "${OUTDir_TMP}" dGR al3xtjames NoTouchID NULL "${OUTDir_TMP}" @@ -231,7 +228,7 @@ function patch() { local unusedItems=( "HibernationFixup.kext/Contents/_CodeSignature" "Kexts/SMCBatteryManager.kext/Contents/Resources" - "Release/CodecCommander.kext/Contents/Resources" + "CodecCommander.kext/Contents/Resources" "RestrictEvents.kext/Contents/_CodeSignature" "VoodooI2C.kext/Contents/PlugIns/VoodooInput.kext.dSYM" "VoodooI2C.kext/Contents/PlugIns/VoodooInput.kext/Contents/_CodeSignature" diff --git a/OC/config_cml.plist b/OC/config_cml.plist index 715db2cc..d15cac42 100644 --- a/OC/config_cml.plist +++ b/OC/config_cml.plist @@ -1066,7 +1066,7 @@ PickerMode External PickerVariant - Modern + Default PollAppleHotKeys ShowPicker diff --git a/OC/config_kbl.plist b/OC/config_kbl.plist index a4b2d53c..dc42c1c5 100644 --- a/OC/config_kbl.plist +++ b/OC/config_kbl.plist @@ -1121,7 +1121,7 @@ PickerMode External PickerVariant - Modern + Default PollAppleHotKeys ShowPicker