Преглед изворни кода

ci: fix workflow condition and add patch for older kernel sublevels

- Remove erroneous `&& false` from the "Fix Less Than 6.6.50 Builds" job condition
- Add missing namespace.c patch application for kernel sublevel <= 46 in susfs-patches action
TheWildJames пре 6 месеци
родитељ
комит
6c257fc383
2 измењених фајлова са 6 додато и 1 уклоњено
  1. 5 0
      .github/actions/susfs-patches/action.yml
  2. 1 1
      .github/workflows/build.yml

+ 5 - 0
.github/actions/susfs-patches/action.yml

@@ -124,4 +124,9 @@ runs:
         if [[ "$SUBLEVEL" -le 58 ]]; then
           cp ${{ github.workspace }}/kernel_patches/wild/susfs_fix_patches/v${SUSFS_VERSION}/a15-6.6/task_mmu.c.patch ./
           patch -p1 < task_mmu.c.patch
+        fi
+
+        if [[ "$SUBLEVEL" -le 46 ]]; then
+          cp ${{ github.workspace }}/kernel_patches/wild/susfs_fix_patches/v${SUSFS_VERSION}/a15-6.6/namespace.c.patch ./
+          patch -p1 < namespace.c.patch
         fi

+ 1 - 1
.github/workflows/build.yml

@@ -172,7 +172,7 @@ jobs:
         fi 
 
     - name: Fix Less Than 6.6.50 Builds
-      if: ${{ steps.parse.outputs.android_version == 'android15' && steps.parse.outputs.kernel_version == '6.6' && false }}
+      if: ${{ steps.parse.outputs.android_version == 'android15' && steps.parse.outputs.kernel_version == '6.6'}}
       working-directory: ${{ github.workspace }}/kernel/common
       run: |
         if ! grep -qxF '#include <trace/hooks/fs.h>' ./fs/namespace.c; then