|
@@ -130,9 +130,9 @@ jobs:
|
|
|
- name: Extract Sublevel and Set File Name
|
|
- name: Extract Sublevel and Set File Name
|
|
|
run: |
|
|
run: |
|
|
|
ACTUAL_SUBLEVEL="${{ inputs.sub_level }}"
|
|
ACTUAL_SUBLEVEL="${{ inputs.sub_level }}"
|
|
|
- if [ -f "$KERNEL_ROOT/common/Makefile" ]; then
|
|
|
|
|
|
|
+ if [[ -f "$KERNEL_ROOT/common/Makefile" ]]; then
|
|
|
EXTRACTED=$(grep '^SUBLEVEL = ' "$KERNEL_ROOT/common/Makefile" | awk '{print $3}')
|
|
EXTRACTED=$(grep '^SUBLEVEL = ' "$KERNEL_ROOT/common/Makefile" | awk '{print $3}')
|
|
|
- [ -n "$EXTRACTED" ] && ACTUAL_SUBLEVEL="$EXTRACTED"
|
|
|
|
|
|
|
+ [[ -n "$EXTRACTED" ]] && ACTUAL_SUBLEVEL="$EXTRACTED"
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
ARTIFACT_BASE="${{ inputs.kernel_version }}.$ACTUAL_SUBLEVEL-${{ inputs.android_version }}-${{ inputs.os_patch_level }}-${{ matrix.build_type }}"
|
|
ARTIFACT_BASE="${{ inputs.kernel_version }}.$ACTUAL_SUBLEVEL-${{ inputs.android_version }}-${{ inputs.os_patch_level }}-${{ matrix.build_type }}"
|
|
@@ -181,41 +181,41 @@ jobs:
|
|
|
run: |
|
|
run: |
|
|
|
case "${{ inputs.ksu_variant }}" in
|
|
case "${{ inputs.ksu_variant }}" in
|
|
|
WKSU)
|
|
WKSU)
|
|
|
- if [ -n "${{ inputs.ksu_commit }}" ]; then
|
|
|
|
|
|
|
+ if [[ -n "${{ inputs.ksu_commit }}" ]]; then
|
|
|
curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
|
else
|
|
else
|
|
|
curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash -s wild
|
|
curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash -s wild
|
|
|
fi
|
|
fi
|
|
|
;;
|
|
;;
|
|
|
Next)
|
|
Next)
|
|
|
- if [ "${{ inputs.ksu_commit }}" == "wild" ]; then
|
|
|
|
|
|
|
+ if [[ "${{ inputs.ksu_commit }}" == "wild" ]]; then
|
|
|
curl -LSs "https://raw.githubusercontent.com/WildKernels/KernelSU-Next/wild/kernel/setup.sh" | bash -s wild
|
|
curl -LSs "https://raw.githubusercontent.com/WildKernels/KernelSU-Next/wild/kernel/setup.sh" | bash -s wild
|
|
|
- elif [ "${{ inputs.ksu_commit }}" == "pershoot" ]; then
|
|
|
|
|
|
|
+ elif [[ "${{ inputs.ksu_commit }}" == "pershoot" ]]; then
|
|
|
curl -LSs "https://raw.githubusercontent.com/pershoot/KernelSU-Next/dev-susfs/kernel/setup.sh" | bash -s dev-susfs
|
|
curl -LSs "https://raw.githubusercontent.com/pershoot/KernelSU-Next/dev-susfs/kernel/setup.sh" | bash -s dev-susfs
|
|
|
cd KernelSU-Next
|
|
cd KernelSU-Next
|
|
|
COMMIT_HASH=$(git log --grep="kernel: Allow building when KSU_SUSFS is unset" -n 1 --format=%H)
|
|
COMMIT_HASH=$(git log --grep="kernel: Allow building when KSU_SUSFS is unset" -n 1 --format=%H)
|
|
|
- if [ -n "$COMMIT_HASH" ]; then
|
|
|
|
|
|
|
+ if [[ -n "$COMMIT_HASH" ]]; then
|
|
|
echo "Found commit $COMMIT_HASH, restoring kernel/Kbuild..."
|
|
echo "Found commit $COMMIT_HASH, restoring kernel/Kbuild..."
|
|
|
git restore --source="${COMMIT_HASH}^" -- kernel/Kbuild
|
|
git restore --source="${COMMIT_HASH}^" -- kernel/Kbuild
|
|
|
else
|
|
else
|
|
|
echo "Commit not found"
|
|
echo "Commit not found"
|
|
|
exit 1
|
|
exit 1
|
|
|
fi
|
|
fi
|
|
|
- elif [ -n "${{ inputs.ksu_commit }}" ]; then
|
|
|
|
|
|
|
+ elif [[ -n "${{ inputs.ksu_commit }}" ]]; then
|
|
|
curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/stable/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/stable/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
|
else
|
|
else
|
|
|
curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/dev/kernel/setup.sh" | bash -
|
|
curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/dev/kernel/setup.sh" | bash -
|
|
|
fi
|
|
fi
|
|
|
;;
|
|
;;
|
|
|
KSU)
|
|
KSU)
|
|
|
- if [ -n "${{ inputs.ksu_commit }}" ]; then
|
|
|
|
|
|
|
+ if [[ -n "${{ inputs.ksu_commit }}" ]]; then
|
|
|
curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
|
else
|
|
else
|
|
|
curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh" | bash -s main
|
|
curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh" | bash -s main
|
|
|
fi
|
|
fi
|
|
|
;;
|
|
;;
|
|
|
RKSU)
|
|
RKSU)
|
|
|
- if [ -n "${{ inputs.ksu_commit }}" ]; then
|
|
|
|
|
|
|
+ if [[ -n "${{ inputs.ksu_commit }}" ]]; then
|
|
|
curl -LSs "https://raw.githubusercontent.com/rsuntk/KernelSU/main/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
curl -LSs "https://raw.githubusercontent.com/rsuntk/KernelSU/main/kernel/setup.sh" | bash -s "${{ inputs.ksu_commit }}"
|
|
|
else
|
|
else
|
|
|
curl -LSs "https://raw.githubusercontent.com/rsuntk/KernelSU/main/kernel/setup.sh" | bash -s main
|
|
curl -LSs "https://raw.githubusercontent.com/rsuntk/KernelSU/main/kernel/setup.sh" | bash -s main
|
|
@@ -257,11 +257,11 @@ jobs:
|
|
|
;;
|
|
;;
|
|
|
Next)
|
|
Next)
|
|
|
cd "$KERNEL_ROOT/KernelSU-Next"
|
|
cd "$KERNEL_ROOT/KernelSU-Next"
|
|
|
- if [ -n "${{ inputs.ksu_commit }}" ]; then
|
|
|
|
|
|
|
+ if [[ -n "${{ inputs.ksu_commit }}" ]]; then
|
|
|
echo "add if needed"
|
|
echo "add if needed"
|
|
|
- elif [ ${{ inputs.ksu_commit }} == "wild" ]; then
|
|
|
|
|
|
|
+ elif [[ ${{ inputs.ksu_commit }} == "wild" ]]; then
|
|
|
echo "add if needed"
|
|
echo "add if needed"
|
|
|
- elif [ ${{ inputs.ksu_commit }} == "pershoot" ]; then
|
|
|
|
|
|
|
+ elif [[ ${{ inputs.ksu_commit }} == "pershoot" ]]; then
|
|
|
echo "add if needed"
|
|
echo "add if needed"
|
|
|
else
|
|
else
|
|
|
echo "patching kernel"
|
|
echo "patching kernel"
|
|
@@ -302,25 +302,25 @@ jobs:
|
|
|
patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
|
|
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 [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" ]]; then
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -le 209 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 209 ]]; then
|
|
|
sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
|
|
sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
|
|
|
fi
|
|
fi
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -le 117 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 117 ]]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a12-5.10/fdinfo.c.patch ./
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a12-5.10/fdinfo.c.patch ./
|
|
|
patch -p1 < fdinfo.c.patch
|
|
patch -p1 < fdinfo.c.patch
|
|
|
fi
|
|
fi
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -le 43 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 43 ]]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a12-5.10/base.c.patch ./
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a12-5.10/base.c.patch ./
|
|
|
patch -p1 < base.c.patch
|
|
patch -p1 < base.c.patch
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
if [[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.10" ]]; then
|
|
if [[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.10" ]]; then
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -le 107 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 107 ]]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a13-5.10/fdinfo.c.patch ./
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a13-5.10/fdinfo.c.patch ./
|
|
|
patch -p1 < fdinfo.c.patch
|
|
patch -p1 < fdinfo.c.patch
|
|
|
fi
|
|
fi
|
|
|
- if ["$ACTUAL_SUBLEVEL" -le 209 && "${{ inputs.os_patch_level }}" != "2024-05" ];then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 209 && "${{ inputs.os_patch_level }}" != "2024-05" ]]; then
|
|
|
sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
|
|
sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
@@ -353,7 +353,7 @@ jobs:
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
if [[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" ]]; then
|
|
if [[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" ]]; then
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -ge 145 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -ge 145 ]]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a14-6.1/base.c.patch ./
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a14-6.1/base.c.patch ./
|
|
|
patch -p1 < base.c.patch
|
|
patch -p1 < base.c.patch
|
|
|
fi
|
|
fi
|
|
@@ -363,18 +363,18 @@ jobs:
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
if [[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" ]]; then
|
|
if [[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" ]]; then
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -ge 98 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -ge 98 ]]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a15-6.6/base.c.patch ./
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a15-6.6/base.c.patch ./
|
|
|
patch -p1 < base.c.patch
|
|
patch -p1 < base.c.patch
|
|
|
fi
|
|
fi
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -le 58 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 58 ]]; then
|
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a15-6.6/task_mmu.c.patch ./
|
|
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a15-6.6/task_mmu.c.patch ./
|
|
|
patch -p1 < task_mmu.c.patch
|
|
patch -p1 < task_mmu.c.patch
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
if [[ "${{ inputs.android_version }}" == "android16" && "${{ inputs.kernel_version }}" == "6.12" ]]; then
|
|
if [[ "${{ inputs.android_version }}" == "android16" && "${{ inputs.kernel_version }}" == "6.12" ]]; then
|
|
|
- if [ "$ACTUAL_SUBLEVEL" -le 9999 ]; then
|
|
|
|
|
|
|
+ if [[ "$ACTUAL_SUBLEVEL" -le 9999 ]]; then
|
|
|
echo "Nothing to fix!"
|
|
echo "Nothing to fix!"
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
@@ -404,7 +404,7 @@ jobs:
|
|
|
patch -p1 --forward < file_struct_8bytes_align.patch
|
|
patch -p1 --forward < file_struct_8bytes_align.patch
|
|
|
cp "$KERNEL_PATCHES/common/reduce_cache_pressure.patch" ./
|
|
cp "$KERNEL_PATCHES/common/reduce_cache_pressure.patch" ./
|
|
|
patch -p1 --forward < reduce_cache_pressure.patch
|
|
patch -p1 --forward < reduce_cache_pressure.patch
|
|
|
- if [ "$(printf '%s\n' "${{ inputs.kernel_version }}" "$MIN_VERSION" | sort -V | head -n1)" = "${{ inputs.kernel_version }}" ]; then
|
|
|
|
|
|
|
+ if [[ "$(printf '%s\n' "${{ inputs.kernel_version }}" "$MIN_VERSION" | sort -V | head -n1)" = "${{ inputs.kernel_version }}" ]]; then
|
|
|
cp "$KERNEL_PATCHES/common/clear_page_16bytes_align.patch" ./
|
|
cp "$KERNEL_PATCHES/common/clear_page_16bytes_align.patch" ./
|
|
|
patch -p1 --forward < clear_page_16bytes_align.patch
|
|
patch -p1 --forward < clear_page_16bytes_align.patch
|
|
|
else
|
|
else
|