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