From 2eed3925db06f56f37cdf662b6fcccc5ce696eed Mon Sep 17 00:00:00 2001 From: SupeChicken666 Date: Sat, 3 Aug 2024 22:36:56 +0800 Subject: [PATCH] ci: Fix ARCVM workflow to adapt to the change of kernel/Makefile (#1906) Probably fixes #1655, likely related Signed-off-by: supechicken --- .github/workflows/build-kernel-arcvm.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-kernel-arcvm.yml b/.github/workflows/build-kernel-arcvm.yml index 18c97c2f..9dbe8de1 100644 --- a/.github/workflows/build-kernel-arcvm.yml +++ b/.github/workflows/build-kernel-arcvm.yml @@ -82,7 +82,7 @@ jobs: SUBLEVEL=$(grep -E '^SUBLEVEL = ' Makefile | awk '{print $3}') echo "ChromeOS ARCVM Linux kernel version: $VERSION.$PATCHLEVEL.$SUBLEVEL" echo "version=$VERSION.$PATCHLEVEL.$SUBLEVEL" >> $GITHUB_ENV - + - name: Setup KernelSU working-directory: kernel run: | @@ -94,7 +94,9 @@ jobs: echo "[+] Add KernelSU driver to Makefile" DRIVER_MAKEFILE=$KERNEL_ROOT/drivers/Makefile - grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE + DRIVER_KCONFIG=$KERNEL_ROOT/drivers/Kconfig + grep -q "kernelsu" "$DRIVER_MAKEFILE" || printf "\nobj-\$(CONFIG_KSU) += kernelsu/\n" >> "$DRIVER_MAKEFILE" + grep -q "kernelsu" "$DRIVER_KCONFIG" || sed -i "/endmenu/i\\source \"drivers/kernelsu/Kconfig\"" "$DRIVER_KCONFIG" echo "[+] Apply KernelSU patches" cd $KERNEL_ROOT && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/5.10/*.patch || echo "[-] No patch found"