Add Some Openwrt 5.4 Kernel Patches to Lean

.github/workflows/lean.yml

@@ -43,11 +43,11 @@ jobs:
       - name: Patch Kernel
         run: |
           . Lean/patch_kernel_5.4.sh
-
+  
       - name: Rebase on Lean
         run: |
           . Lean/rebase_on_lean.sh
-      
+
       - name: Add Packages to Lean
         run: |
           . add_packages_to_lean.sh
@@ -56,6 +56,12 @@ jobs:
         run: |
           . Lean/lean_patches.sh
 
+      - name: Install Openwrt octeontx patches
+        run: |
+          cd friendlywrt-rk3328
+          cp -r openwrt/target/linux/octeontx/patches-5.4 friendlywrt/target/linux/rockchip-rk3328/
+          ls friendlywrt/target/linux/rockchip-rk3328/patches-5.4
+
       - name: Change Log
         id: changelog
         run: |

Lean/lean_patches.sh

@@ -22,3 +22,5 @@ mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit
 echo ""
 echo "package/base-files/files/etc/rc.local"
 cat package/base-files/files/etc/rc.local
+
+sed -i "s/65536/65535/" package/kernel/linux/files/sysctl-nf-conntrack.conf

Lean/rebase_on_lean.sh

@@ -5,12 +5,12 @@ cd friendlywrt
 git config --global user.email "action@github.com" && git config --global user.name "GitHub Action"
 ../../set_repo_hash.sh Lean https://github.com/coolsnowwolf/lede.git
 git remote add upstream https://github.com/coolsnowwolf/lede.git && git fetch upstream
-git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs
+git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X ours
 echo ""
 git status
 echo ""
-git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
 git checkout upstream/master -- feeds.conf.default
+git checkout upstream/master -- package/kernel/mac80211/files/lib/netifd/mac80211.sh
 echo ""
 git status
 echo ""

add_fullconenat.diff

@@ -795,4 +795,4 @@ index 000000000..8555b54e2
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Xtables: implementation of RFC3489 full cone NAT");
 +MODULE_AUTHOR("Chion Tang <tech@chionlab.moe>");
-+MODULE_ALIAS("ipt_FULLCONENAT");
\ No newline at end of file
++MODULE_ALIAS("ipt_FULLCONENAT");