diff --git a/.github/workflows/Build Kernel Only.yml b/.github/workflows/Build Kernel Only.yml index 5dd1ea42..e3a99375 100644 --- a/.github/workflows/Build Kernel Only.yml +++ b/.github/workflows/Build Kernel Only.yml @@ -128,6 +128,15 @@ on: - 'On' - 'Off' default: 'Off' + + GUNYAH_FIX: + description: "是否添加 Gunyah修复补丁(仅6.1内核生效)" + required: true + type: choice + options: + - 'On' + - 'Off' + default: 'Off' jobs: build: @@ -271,6 +280,11 @@ jobs: cp ../kernel_patches/common/unicode_bypass_fix_6.1-.patch ./common/unicode_bypass_fix.patch fi fi + + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + cp ../kernel_patches/common/gunyah_large_memory_access_fix.patch ./common/ + cp ../kernel_patches/common/gunyah_scm_vmid_fix.patch ./common/ + fi if [ "${{ github.event.inputs.lz4kd }}" == "On" ]; then # Copy lz4k from ShirkNeko @@ -289,6 +303,12 @@ jobs: patch -p1 < unicode_bypass_fix.patch fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + echo "📦 正在应用 Gunyah 修复补丁..." + patch -p1 < gunyah_large_memory_access_fix.patch + patch -p1 < gunyah_scm_vmid_fix.patch + fi + if [ "${{ github.event.inputs.lz4kd }}" = "Off" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then echo "📦 应用lz4+zstd补丁..." git apply -p1 < 001-lz4.patch || true @@ -507,4 +527,4 @@ jobs: uses: actions/upload-artifact@v7 with: name: ${{ github.event.inputs.FEIL }}_zram.ko - path: ./kernel_workspace/kernel_platform/common/out/drivers/block/zram/zram.ko \ No newline at end of file + path: ./kernel_workspace/kernel_platform/common/out/drivers/block/zram/zram.ko diff --git a/.github/workflows/Build KernelSU Next.yml b/.github/workflows/Build KernelSU Next.yml index 53d2959d..af0129c0 100644 --- a/.github/workflows/Build KernelSU Next.yml +++ b/.github/workflows/Build KernelSU Next.yml @@ -137,6 +137,15 @@ on: - 'On' - 'Off' default: 'Off' + + GUNYAH_FIX: + description: "是否添加 Gunyah修复补丁(仅6.1内核生效)" + required: true + type: choice + options: + - 'On' + - 'Off' + default: 'Off' jobs: build: @@ -319,6 +328,11 @@ jobs: fi fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + cp ../kernel_patches/common/gunyah_large_memory_access_fix.patch ./common/ + cp ../kernel_patches/common/gunyah_scm_vmid_fix.patch ./common/ + fi + if [ "${{ github.event.inputs.lz4kd }}" == "On" ]; then # Copy lz4k from ShirkNeko cp -r ../SukiSU_patch/other/zram/lz4k/include/linux/* ./common/include/linux @@ -334,6 +348,12 @@ jobs: echo "📦 正在应用Unicode零宽绕过修复补丁..." patch -p1 < unicode_bypass_fix.patch fi + + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + echo "📦 正在应用 Gunyah 修复补丁..." + patch -p1 < gunyah_large_memory_access_fix.patch + patch -p1 < gunyah_scm_vmid_fix.patch + fi if [ "${{ github.event.inputs.lz4kd }}" = "Off" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then echo "📦 应用lz4+zstd补丁..." @@ -616,4 +636,4 @@ jobs: # KPM: Not Support # LZ4KD: ${{ github.event.inputs.lz4kd }} # BBR: ${{ github.event.inputs.bbr }} - # KSU_VAR: "NEXT" \ No newline at end of file + # KSU_VAR: "NEXT" diff --git a/.github/workflows/Build KernelSU.yml b/.github/workflows/Build KernelSU.yml index 559efb7c..1efd165f 100644 --- a/.github/workflows/Build KernelSU.yml +++ b/.github/workflows/Build KernelSU.yml @@ -137,6 +137,15 @@ on: - 'On' - 'Off' default: 'Off' + + GUNYAH_FIX: + description: "是否添加 Gunyah修复补丁(仅6.1内核生效)" + required: true + type: choice + options: + - 'On' + - 'Off' + default: 'Off' jobs: build: @@ -315,6 +324,11 @@ jobs: fi fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + cp ../kernel_patches/common/gunyah_large_memory_access_fix.patch ./common/ + cp ../kernel_patches/common/gunyah_scm_vmid_fix.patch ./common/ + fi + if [ "${{ github.event.inputs.lz4kd }}" == "On" ]; then # Copy lz4k from ShirkNeko cp -r ../SukiSU_patch/other/zram/lz4k/include/linux/* ./common/include/linux @@ -339,6 +353,12 @@ jobs: echo "📦 正在应用Unicode零宽绕过修复补丁..." patch -p1 < unicode_bypass_fix.patch fi + + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + echo "📦 正在应用 Gunyah 修复补丁..." + patch -p1 < gunyah_large_memory_access_fix.patch + patch -p1 < gunyah_scm_vmid_fix.patch + fi if [ "${{ github.event.inputs.lz4kd }}" = "Off" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then echo "📦 应用lz4+zstd补丁..." @@ -588,4 +608,4 @@ jobs: uses: actions/upload-artifact@v7 with: name: ${{ github.event.inputs.FEIL }}_zram.ko - path: ./kernel_workspace/kernel_platform/common/out/drivers/block/zram/zram.ko \ No newline at end of file + path: ./kernel_workspace/kernel_platform/common/out/drivers/block/zram/zram.ko diff --git a/.github/workflows/Build ReSukiSU.yml b/.github/workflows/Build ReSukiSU.yml index 30b6ed96..1ca91f44 100644 --- a/.github/workflows/Build ReSukiSU.yml +++ b/.github/workflows/Build ReSukiSU.yml @@ -146,6 +146,15 @@ on: - 'On' - 'Off' default: 'Off' + + GUNYAH_FIX: + description: "是否添加 Gunyah修复补丁(仅6.1内核生效)" + required: true + type: choice + options: + - 'On' + - 'Off' + default: 'Off' jobs: build: @@ -330,6 +339,11 @@ jobs: fi fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + cp ../kernel_patches/common/gunyah_large_memory_access_fix.patch ./common/ + cp ../kernel_patches/common/gunyah_scm_vmid_fix.patch ./common/ + fi + if [ "${{ github.event.inputs.lz4kd }}" == "On" ]; then # Copy lz4k from ShirkNeko cp -r ../SukiSU_patch/other/zram/lz4k/include/linux/* ./common/include/linux @@ -345,6 +359,12 @@ jobs: patch -p1 < unicode_bypass_fix.patch fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + echo "📦 正在应用 Gunyah 修复补丁..." + patch -p1 < gunyah_large_memory_access_fix.patch + patch -p1 < gunyah_scm_vmid_fix.patch + fi + if [ "${{ github.event.inputs.lz4kd }}" = "Off" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then echo "📦 应用lz4+zstd补丁..." git apply -p1 < 001-lz4.patch || true @@ -624,4 +644,4 @@ jobs: uses: actions/upload-artifact@v7 with: name: ${{ github.event.inputs.FEIL }}_zram.ko - path: ./kernel_workspace/kernel_platform/common/out/drivers/block/zram/zram.ko \ No newline at end of file + path: ./kernel_workspace/kernel_platform/common/out/drivers/block/zram/zram.ko diff --git a/.github/workflows/Build SukiSU Ultra.yml b/.github/workflows/Build SukiSU Ultra.yml index 052d7ed4..63c3490b 100644 --- a/.github/workflows/Build SukiSU Ultra.yml +++ b/.github/workflows/Build SukiSU Ultra.yml @@ -146,6 +146,15 @@ on: - 'On' - 'Off' default: 'Off' + + GUNYAH_FIX: + description: "是否添加 Gunyah修复补丁(仅6.1内核生效)" + required: true + type: choice + options: + - 'On' + - 'Off' + default: 'Off' jobs: build: @@ -333,6 +342,11 @@ jobs: cp ../kernel_patches/common/unicode_bypass_fix_6.1-.patch ./common/unicode_bypass_fix.patch fi fi + + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + cp ../kernel_patches/common/gunyah_large_memory_access_fix.patch ./common/ + cp ../kernel_patches/common/gunyah_scm_vmid_fix.patch ./common/ + fi if [ "${{ github.event.inputs.lz4kd }}" == "On" ]; then # Copy lz4k from ShirkNeko @@ -349,6 +363,12 @@ jobs: patch -p1 < unicode_bypass_fix.patch fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + echo "📦 正在应用 Gunyah 修复补丁..." + patch -p1 < gunyah_large_memory_access_fix.patch + patch -p1 < gunyah_scm_vmid_fix.patch + fi + if [ "${{ github.event.inputs.lz4kd }}" = "Off" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then echo "📦 应用lz4+zstd补丁..." git apply -p1 < 001-lz4.patch || true @@ -652,4 +672,4 @@ jobs: # KPM: ${{ github.event.inputs.KPM }} # LZ4KD: ${{ github.event.inputs.lz4kd }} # BBR: ${{ github.event.inputs.bbr }} - # KSU_VAR: "SukiSU" \ No newline at end of file + # KSU_VAR: "SukiSU" diff --git a/.github/workflows/Build SukiSU Ultra_40129.yml b/.github/workflows/Build SukiSU Ultra_40129.yml index e1f7dd4d..94a8f5d6 100644 --- a/.github/workflows/Build SukiSU Ultra_40129.yml +++ b/.github/workflows/Build SukiSU Ultra_40129.yml @@ -137,6 +137,15 @@ on: - 'On' - 'Off' default: 'Off' + + GUNYAH_FIX: + description: "是否添加 Gunyah修复补丁(仅6.1内核生效)" + required: true + type: choice + options: + - 'On' + - 'Off' + default: 'Off' jobs: build: @@ -320,6 +329,11 @@ jobs: cp ../kernel_patches/common/unicode_bypass_fix_6.1-.patch ./common/unicode_bypass_fix.patch fi fi + + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + cp ../kernel_patches/common/gunyah_large_memory_access_fix.patch ./common/ + cp ../kernel_patches/common/gunyah_scm_vmid_fix.patch ./common/ + fi if [ "${{ github.event.inputs.lz4kd }}" == "On" ]; then # Copy lz4k from ShirkNeko @@ -336,6 +350,12 @@ jobs: patch -p1 < unicode_bypass_fix.patch fi + if [ "${{ github.event.inputs.GUNYAH_FIX }}" = "On" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then + echo "📦 正在应用 Gunyah 修复补丁..." + patch -p1 < gunyah_large_memory_access_fix.patch + patch -p1 < gunyah_scm_vmid_fix.patch + fi + if [ "${{ github.event.inputs.lz4kd }}" = "Off" ] && [ "${{ github.event.inputs.KERNEL_VERSION }}" = "6.1" ]; then echo "📦 应用lz4+zstd补丁..." git apply -p1 < 001-lz4.patch || true @@ -625,4 +645,4 @@ jobs: # KPM: ${{ github.event.inputs.KPM }} # LZ4KD: ${{ github.event.inputs.lz4kd }} # BBR: ${{ github.event.inputs.bbr }} - # KSU_VAR: "SukiSU" \ No newline at end of file + # KSU_VAR: "SukiSU"