From b832308c19c992dfc616ab73d2881a36b89cd43a Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:23:43 +0800
Subject: [PATCH] Update r2s_lean_minimal.yml

---
 .github/workflows/r2s_lean_minimal.yml | 31 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml
index eccf55e..7653e35 100644
--- a/.github/workflows/r2s_lean_minimal.yml
+++ b/.github/workflows/r2s_lean_minimal.yml
@@ -43,19 +43,26 @@ jobs:
           cd friendlywrt-rk3328
           repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m rk3328.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle
           repo sync -c --no-clone-bundle -j8
-
-      - name: Mods
-        env:
-          url_fullconenat_patch: ${{ secrets.url1 }}
-          url_flowoffload_patch: ${{ secrets.url2 }}
+          
+      - 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
+
+      - name: Mods
         run: |
           cd friendlywrt-rk3328
-          cd kernel
-          wget -q ${url_fullconenat_patch}
-          wget -q ${url_flowoffload_patch}
-          git apply add_fullconenat.diff
-          #git apply add_flowoffload.diff
-          cd ..
           . ../remove_unused_config.sh
           #sed -i '/iptparser/d' configs/config_rk3328
           cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed
@@ -66,6 +73,7 @@ jobs:
           CONFIG_OPENSSL_WITH_EC2M=y
           CONFIG_OPENSSL_WITH_NPN=y
           CONFIG_PACKAGE_htop=y
+          CONFIG_PACKAGE_luci-app-frpc=y
           CONFIG_PACKAGE_luci-app-uhttpd=y
           CONFIG_PACKAGE_luci-app-netdata=y
           CONFIG_PACKAGE_luci-app-v2ray-server=y
@@ -140,6 +148,7 @@ jobs:
           #sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
           sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
           echo -e '\nDYC Build\n'  >> package/base-files/files/etc/banner
+          rm target/linux/rockchip-rk3328/base-files/etc/modules.d/10-rtl8821cu
 
       - name: Mod luci
         run: |