Skip to content

Commit 857381b

Browse files
supechickenbackslashxx
authored andcommitted
ci: Fix ARCVM workflow to adapt to the change of kernel/Makefile (tiann#1906)
Probably fixes tiann#1655, likely related Signed-off-by: supechicken <[email protected]>
1 parent 2c6ef21 commit 857381b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/build-kernel-arcvm.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
SUBLEVEL=$(grep -E '^SUBLEVEL = ' Makefile | awk '{print $3}')
8383
echo "ChromeOS ARCVM Linux kernel version: $VERSION.$PATCHLEVEL.$SUBLEVEL"
8484
echo "version=$VERSION.$PATCHLEVEL.$SUBLEVEL" >> $GITHUB_ENV
85-
85+
8686
- name: Setup KernelSU
8787
working-directory: kernel
8888
run: |
@@ -94,7 +94,9 @@ jobs:
9494
9595
echo "[+] Add KernelSU driver to Makefile"
9696
DRIVER_MAKEFILE=$KERNEL_ROOT/drivers/Makefile
97-
grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE
97+
DRIVER_KCONFIG=$KERNEL_ROOT/drivers/Kconfig
98+
grep -q "kernelsu" "$DRIVER_MAKEFILE" || printf "\nobj-\$(CONFIG_KSU) += kernelsu/\n" >> "$DRIVER_MAKEFILE"
99+
grep -q "kernelsu" "$DRIVER_KCONFIG" || sed -i "/endmenu/i\\source \"drivers/kernelsu/Kconfig\"" "$DRIVER_KCONFIG"
98100
99101
echo "[+] Apply KernelSU patches"
100102
cd $KERNEL_ROOT && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/5.10/*.patch || echo "[-] No patch found"

0 commit comments

Comments
 (0)