package upgrade: libpcap

.github/workflows/r1s_lean.yml

@@ -46,9 +46,8 @@ jobs:
           git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
           rm -f target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch
           git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default
-          cd package/lean/
+          curl 'https://git.openwrt.org/?p=openwrt/openwrt.git;a=patch;h=22378beb581b113def1dc392ef75306a2168a163' | git apply --reject - || true
-          . ../../../../3_prepare_packages.sh
+          . ../../3_prepare_packages.sh
-          cd ../../
           git apply ../../enable_autocore.diff
           . ../../5_mods.sh
 

.github/workflows/r1s_lean_h3.yml

@@ -47,9 +47,8 @@ jobs:
           git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
           rm -f target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch
           git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default
-          cd package/lean/
+          curl 'https://git.openwrt.org/?p=openwrt/openwrt.git;a=patch;h=22378beb581b113def1dc392ef75306a2168a163' | git apply --reject - || true
-          . ../../../../3_prepare_packages.sh
+          . ../../3_prepare_packages.sh
-          cd ../../
           git apply ../../enable_autocore.diff
           . ../../5_mods.sh
 

.github/workflows/r2s_lean.yml

@@ -49,9 +49,8 @@ jobs:
           git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
           rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch
           git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default
-          cd package/lean/
+          curl 'https://git.openwrt.org/?p=openwrt/openwrt.git;a=patch;h=22378beb581b113def1dc392ef75306a2168a163' | git apply --reject - || true
-          . ../../../../3_prepare_packages.sh
+          . ../../3_prepare_packages.sh
-          cd ../../
           git apply ../../enable_autocore.diff
           sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile
           . ../../5_mods.sh

.github/workflows/r2s_lean_minimal.yml

@@ -49,21 +49,16 @@ jobs:
           git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
           rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch
           git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default
-          cd package/lean/
+          curl 'https://git.openwrt.org/?p=openwrt/openwrt.git;a=patch;h=22378beb581b113def1dc392ef75306a2168a163' | git apply --reject - || true
-          . ../../../../3_prepare_packages.sh
+          . ../../3_prepare_packages.sh
-          cd ../../
+          . ../../add_openclash.sh
+          . ../../add_passwall.sh
           git apply ../../enable_autocore.diff
           sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile
           . ../../5_mods.sh
           mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit/i\/bin/sh /usr/bin/check_wan4.sh &' package/base-files/files/etc/rc.local
           mv ../../scripts/autoupdate.sh package/base-files/files/root/au.sh && chmod +x package/base-files/files/root/au.sh
 
-      - name: Add OpenClash
-        run: . add_openclash.sh
-
-      - name: Add Passwall
-        run: . add_passwall.sh
-
       - name: Build FriendlyWrt
         run: . 4_build_image.sh friendlywrt-rk3328 nanopi_r2s.mk
 

3_prepare_packages.sh

@@ -1,3 +1,8 @@
+./scripts/feeds update -a && ./scripts/feeds install -a
+rm -rf feeds/packages/libs/libcap && svn co https://github.com/openwrt/packages/trunk/libs/libcap feeds/packages/libs/libcap
+sed -i '/enable-jsonc/i\\t--disable-cloud \\' feeds/packages/admin/netdata/Makefile 
+
+cd package/lean/
 if [[ `pwd` == *"rk3328"* ]]; then
   rm -rf luci-app-oled/ && git clone https://github.com/NateLol/luci-app-oled
 fi
@@ -9,6 +14,8 @@ rm -rf luci-theme-edge/ && git clone -b 18.06 https://github.com/garypang13/luci
 rm -rf luci-theme-infinityfreedom/ && git clone https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom
 rm -rf luci-app-chinadns-ng/ && git clone https://github.com/WuSiYu/luci-app-chinadns-ng
 rm -rf openwrt-chinadns-ng/ && git clone https://github.com/pexcn/openwrt-chinadns-ng
+cd ../../
+
 
 #git clone https://github.com/jerrykuku/lua-maxminddb.git
 #git clone https://github.com/jerrykuku/luci-app-vssr.git

4_build_image.sh

@@ -1,11 +1,11 @@
 cd $1
 cd friendlywrt
-./scripts/feeds update -a && ./scripts/feeds install -a
 sed -i '/STAMP_BUILT/d' feeds/packages/utils/runc/Makefile feeds/packages/utils/containerd/Makefile #fix compile error
 cd ..
 
 echo -e '\nCONFIG_TCP_CONG_ADVANCED=y' >> kernel/arch/arm/configs/sunxi_defconfig
 echo -e '\nCONFIG_TCP_CONG_BBR=m' >> kernel/arch/arm/configs/sunxi_defconfig
+sed -i '/feeds/d' scripts/mk-friendlywrt.sh
 sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
 sed -i 's/640/1000/' scripts/sd-fuse/mk-sd-image.sh
 ./build.sh $2

add_openclash.sh

@@ -1,6 +1,8 @@
+cd ../../
 git clone -b master https://github.com/vernesong/OpenClash.git 
 mv OpenClash/luci-app-openclash friendlywrt-rk3328/friendlywrt/package
 cd friendlywrt-rk3328/friendlywrt/package/base-files/files
 mkdir -p etc/openclash/core && cd etc/openclash/core
 curl -L https://github.com/vernesong/OpenClash/releases/download/Clash/clash-linux-armv8.tar.gz | tar zxf -
 chmod +x clash
+cd ../../../../../../

add_passwall.sh

@@ -1,6 +1,5 @@
-cd friendlywrt-rk3328/friendlywrt
 echo -e '\nsrc-git lienol https://github.com/xiaorouji/openwrt-package' >> feeds.conf.default
-./scripts/feeds update -a
+./scripts/feeds update lienol
 rm -rf feeds/lienol/lienol/ipt2socks
 rm -rf feeds/lienol/lienol/shadowsocksr-libev
 rm -rf feeds/lienol/lienol/pdnsd-alt
@@ -11,4 +10,4 @@ rm -rf package/lean/luci-app-kodexplorer
 rm -rf package/lean/luci-app-pppoe-relay
 rm -rf package/lean/luci-app-pptp-server
 rm -rf package/lean/luci-app-v2ray-server
-./scripts/feeds install -a
+./scripts/feeds install -p lienol