diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 62e6e9f..975b6bd 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -46,20 +46,8 @@ jobs: - name: Patch Kernel run: | - cd friendlywrt-rk3328 - cd kernel/ && git apply ../../add_fullconenat.diff && cd ../ - git clone https://github.com/openwrt/openwrt - rm openwrt/target/linux/generic/pending-5.4/403-mtd-hook-mtdsplit-to-Kbuild.patch - rm openwrt/target/linux/generic/hack-5.4/700-swconfig_switch_drivers.patch - cd openwrt/ - ./scripts/patch-kernel.sh ../kernel target/linux/generic/backport-5.4 - ./scripts/patch-kernel.sh ../kernel target/linux/generic/pending-5.4 - ./scripts/patch-kernel.sh ../kernel target/linux/generic/hack-5.4 - cd ../ - wget https://github.com/torvalds/linux/raw/master/scripts/kconfig/merge_config.sh && chmod +x merge_config.sh - grep -i '_NETFILTER_\|FLOW' ../.config.override > .config.override - ./merge_config.sh -m .config.override kernel/arch/arm64/configs/nanopi-r2_linux_defconfig && mv .config kernel/arch/arm64/configs/nanopi-r2_linux_defconfig - + . ../patch_kernel_5.4.22.sh + - name: Mods run: | cd friendlywrt-rk3328