|
|
@@ -253,15 +253,6 @@ jobs:
|
|
|
;;
|
|
|
esac
|
|
|
|
|
|
- cp "$SUSFS4KSU/kernel_patches/fs/"* "$KERNEL_ROOT/common/fs/"
|
|
|
- cp "$SUSFS4KSU/kernel_patches/include/linux/"* "$KERNEL_ROOT/common/include/linux/"
|
|
|
-
|
|
|
- # Apply core SUSFS patches
|
|
|
- cd "$KERNEL_ROOT/common"
|
|
|
- PATCH_FILE="50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch"
|
|
|
- cp "$SUSFS4KSU/kernel_patches/$PATCH_FILE" ./
|
|
|
- patch -p1 < "$PATCH_FILE" || true
|
|
|
-
|
|
|
case "${{ inputs.ksu_variant }}" in
|
|
|
WKSU)
|
|
|
cd "$KERNEL_ROOT/Wild_KSU"
|
|
|
@@ -271,23 +262,48 @@ jobs:
|
|
|
if [ -n "${{ inputs.ksu_commit }}" ]; then
|
|
|
echo "add if needed"
|
|
|
elif [ ${{ inputs.ksu_commit }} == "wild" ]; then
|
|
|
- cp "$KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/"*.patch ./
|
|
|
+ echo "add if needed"
|
|
|
elif [ ${{ inputs.ksu_commit }} == "pershoot" ]; then
|
|
|
- cp "$KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/"*.patch ./
|
|
|
+ echo "add if needed"
|
|
|
else
|
|
|
+ echo "patching kernel"
|
|
|
cp $SUSFS4KSU/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
|
|
|
patch -p1 < 10_enable_susfs_for_ksu.patch || true
|
|
|
+ echo "patching susfs fix patches"
|
|
|
cp "$KERNEL_PATCHES/next/susfs_fix_patches/v${SUSFS_VERSION}/"*.patch ./
|
|
|
- for patch in fix_*.patch; do
|
|
|
- patch -p1 < "$patch"
|
|
|
- done
|
|
|
+ echo "fixing Makefile/kbuild"
|
|
|
+ patch -p1 < fix_Makefile.patch
|
|
|
+ echo "fixing allowlist.c"
|
|
|
+ patch -p1 < fix_allowlist.c.patch
|
|
|
+ echo "fixing apk_sign.c"
|
|
|
+ patch -p1 < fix_apk_sign.c.patch
|
|
|
+ echo "fixing kernel_umount.c"
|
|
|
+ patch -p1 < fix_kernel_umount.c.patch
|
|
|
+ echo "fixing ksu.c"
|
|
|
+ patch -p1 < fix_ksu.c.patch
|
|
|
+ echo "fixing ksud.c"
|
|
|
+ patch -p1 < fix_ksud.c.patch
|
|
|
+ echo "fixing selinux.c"
|
|
|
+ patch -p1 < fix_selinux.c.patch
|
|
|
+ echo "fixing setuid_hook.c"
|
|
|
+ patch -p1 < fix_setuid_hook.c.patch
|
|
|
+ echo "fixing sucompat.c"
|
|
|
+ patch -p1 < fix_sucompat.c.patch
|
|
|
+ echo "fixing supercalls.c"
|
|
|
+ patch -p1 < fix_supercalls.c.patch
|
|
|
+ echo "overwriting hook mode"
|
|
|
patch -p1 < overwrite_hook_mode.patch
|
|
|
+ echo "patching ksu_toolkit"
|
|
|
patch -p1 < ksu_toolkit.patch
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
cd "$KERNEL_ROOT/common"
|
|
|
+ cp "$SUSFS4KSU/kernel_patches/fs/"* "$KERNEL_ROOT/common/fs/"
|
|
|
+ cp "$SUSFS4KSU/kernel_patches/include/linux/"* "$KERNEL_ROOT/common/include/linux/"
|
|
|
+ cp $SUSFS4KSU/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./
|
|
|
+ patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
|
|
|
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" ]]; then
|
|
|
if [ "$ACTUAL_SUBLEVEL" -le 117 ]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a12-5.10/fdinfo.c.patch ./
|