Skip to content

Commit 9c51b71

Browse files
committed
ci(workflows): simplify build process and enable BBG
- Remove redundant SUSFS patch logic for WKSU and Next variants - Enable Baseband-guard (BBG) installation by default - Change LTO setting from 'none' to 'thin' for aarch64 build
1 parent 302e23e commit 9c51b71

File tree

1 file changed

+4
-87
lines changed

1 file changed

+4
-87
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@ jobs:
255255
cd "$KERNEL_ROOT/KernelSU-Next"
256256
#cp "$KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/"*.patch ./
257257
#patch -p1 < Next-3.0.0-susfs-2.0.0-AIO.patch
258+
259+
cd "$KERNEL_ROOT/common"
258260
;;
259261
KSU)
260262
cd "$KERNEL_ROOT/KernelSU"
@@ -263,92 +265,7 @@ jobs:
263265
;;
264266
esac
265267
266-
cd "$KERNEL_ROOT/common"
267-
# Post-SUSFS sed safeguards for task_mmu.c 'goto show_pad' handling
268268
case "${{ inputs.ksu_variant }}" in
269-
WKSU)
270-
echo "Applying show_pad; patch..."
271-
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 209 ]] ||
272-
[[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.10" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 209 ]] ||
273-
[[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.15" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 148 ]] ||
274-
[[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "5.15" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 148 ]] ||
275-
[[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 75 ]]; then
276-
sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
277-
fi
278-
279-
echo "Applying 1_fix_base.c; patch..."
280-
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 43 ]] ||
281-
[[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" && $ACTUAL_SUBLEVEL -ge 145 ]] ||
282-
[[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" && $ACTUAL_SUBLEVEL -ge 98 ]]; then
283-
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/1_fix_base.c.patch ./
284-
patch -p1 < 1_fix_base.c.patch
285-
fi
286-
287-
echo "Applying 2_fix_base.c; patch..."
288-
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 43 ]]; then
289-
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/2_fix_base.c.patch ./
290-
patch -p1 < 2_fix_base.c.patch
291-
fi
292-
293-
echo "Applying fix_task_mmu.c; patch..."
294-
if [[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" && $ACTUAL_SUBLEVEL -le 58 ]]; then
295-
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/fix_task_mmu.c.patch ./
296-
patch -p1 < fix_task_mmu.c.patch
297-
fi
298-
299-
echo "Applying Android 13 5.15 patchs..."
300-
# Apply additional SUSFS patches for Android 13 5.15 compatibility
301-
if [[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.15" ]] && [[ ${{ inputs.sub_level }} -le 41 ]]; then
302-
cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_fdinfo.c.patch ./
303-
patch -p1 < fix_fdinfo.c.patch
304-
cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_namespace.c.patch ./
305-
patch -p1 < fix_namespace.c.patch
306-
cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_open.c.patch ./
307-
patch -p1 < fix_open.c.patch
308-
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
309-
fi
310-
;;
311-
Next)
312-
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 209 ]] ||
313-
[[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.10" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 209 ]] ||
314-
[[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.15" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 148 ]] ||
315-
[[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "5.15" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 148 ]] ||
316-
[[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 75 ]]; then
317-
echo "Applying show_pad; patch..."
318-
sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
319-
fi
320-
321-
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 43 ]] ||
322-
[[ "${{ inputs.android_version }}" == "android14" && "${{ inputs.kernel_version }}" == "6.1" && $ACTUAL_SUBLEVEL -ge 145 ]] ||
323-
[[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" && $ACTUAL_SUBLEVEL -ge 98 ]]; then
324-
echo "Applying 1_fix_base.c; patch..."
325-
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/1_fix_base.c.patch ./
326-
patch -p1 < 1_fix_base.c.patch
327-
fi
328-
329-
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 43 ]]; then
330-
echo "Applying 2_fix_base.c; patch..."
331-
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/2_fix_base.c.patch ./
332-
patch -p1 < 2_fix_base.c.patch
333-
fi
334-
335-
if [[ "${{ inputs.android_version }}" == "android15" && "${{ inputs.kernel_version }}" == "6.6" && $ACTUAL_SUBLEVEL -le 58 ]]; then
336-
echo "Applying fix_task_mmu.c; patch..."
337-
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/fix_task_mmu.c.patch ./
338-
patch -p1 < fix_task_mmu.c.patch
339-
fi
340-
341-
if [[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.15" ]] && [[ ${{ inputs.sub_level }} -le 41 ]]; then
342-
echo "Applying Android 13 5.15 patchs..."
343-
cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_fdinfo.c.patch ./
344-
patch -p1 < fix_fdinfo.c.patch
345-
cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_namespace.c.patch ./
346-
patch -p1 < fix_namespace.c.patch
347-
cp $KERNEL_PATCHES/ksu/susfs_fix_patches/v${SUSFS_VERSION}/fix_open.c.patch ./
348-
patch -p1 < fix_open.c.patch
349-
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
350-
fi
351-
;;
352269
KSU)
353270
if [[ "${{ inputs.android_version }}" == "android12" && "${{ inputs.kernel_version }}" == "5.10" && $ACTUAL_SUBLEVEL -le 209 ]] ||
354271
[[ "${{ inputs.android_version }}" == "android13" && "${{ inputs.kernel_version }}" == "5.10" && "${{ inputs.os_patch_level }}" != "2024-05" && $ACTUAL_SUBLEVEL -le 209 ]] ||
@@ -416,7 +333,7 @@ jobs:
416333
fi
417334
418335
- name: Add BBG
419-
if: false
336+
if: true
420337
working-directory: ${{ env.KERNEL_ROOT }}
421338
run: |
422339
curl -LSs https://github.com/vc-teahouse/Baseband-guard/raw/main/setup.sh | bash
@@ -701,7 +618,7 @@ jobs:
701618
run: |
702619
set -ex
703620
if [ -f "build/build.sh" ]; then
704-
LTO=none BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh || exit 1
621+
LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh || exit 1
705622
else
706623
tools/bazel build --config=fast --lto=none //common:kernel_aarch64_dist || exit 1
707624
fi

0 commit comments

Comments
 (0)