Forráskód Böngészése

KSU Android 13 5.15 compatibility

TheWildJames 9 hónapja
szülő
commit
7dbc85275b
2 módosított fájl, 26 hozzáadás és 7 törlés
  1. 20 1
      .github/workflows/build.yml
  2. 6 6
      .github/workflows/main.yml

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

@@ -262,7 +262,14 @@ jobs:
         run: |
           
           # Apply compatibility fixes
-          SUSFS_VERSION="1.5.12"
+          case "${{ inputs.ksu_variant }}" in
+            WKSU)
+              SUSFS_VERSION="1.5.12"
+            ;;
+            KSU)
+              SUSFS_VERSION="2.0.0"
+            ;;
+          esac
 
           cp "$SUSFS4KSU/kernel_patches/fs/"* "$KERNEL_ROOT/common/fs/"
           cp "$SUSFS4KSU/kernel_patches/include/linux/"* "$KERNEL_ROOT/common/include/linux/"
@@ -346,6 +353,17 @@ jobs:
                  [[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 75 ]]; then
                 sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
               fi
+
+              # Apply additional SUSFS patches for Android 13 5.15 compatibility
+              if [[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.15" ]] && [[ ${{ inputs.sub_level }} -le 41 ]]; then
+                cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_fdinfo.c.patch ./
+                patch -p1 < fix_fdinfo.c.patch || true
+                cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_namespace.c.patch ./
+                patch -p1 < fix_namespace.c.patch || true
+                cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_open.c.patch ./
+                patch -p1 < fix_open.c.patch || true
+                #sed -i 's/i_uid_into_mnt(i_user_ns(inode), inode)/i_uid_into_mnt(inode->i_sb->s_user_ns, inode)/g' fs/susfs.c
+              fi
               ;;
           esac
 
@@ -969,6 +987,7 @@ jobs:
           fi
 
       - name: Artifacts
+        if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.FILE_NAME }}-Misc

+ 6 - 6
.github/workflows/main.yml

@@ -160,12 +160,6 @@ jobs:
             echo "New tag: $NEW_TAG"
             echo "NEW_TAG=${NEW_TAG}" >> $GITHUB_ENV
 
-      - name: Download Artifacts
-        uses: actions/download-artifact@v5
-        with:
-          path: ./downloaded-artifacts
-          pattern: '*-AnyKernel3'
-
       - name: Set release body
         run: |
           cat << 'EOF' > release_body.md
@@ -228,6 +222,12 @@ jobs:
           name: ${{ env.RELEASE_NAME }}
           body_path: release_body.md
 
+      - name: Download Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: ./downloaded-artifacts
+          pattern: '*-AnyKernel3'
+
       - name: Upload Release Assets
         run: |
           shopt -s nullglob