package upgrade: libpcap

Author: biliwala

.github/workflows/r2s_lean_minimal_fix.yml

@@ -8,6 +8,7 @@ on:
   # schedule:
     # - cron: '40 06 * * *'
   workflow_dispatch:
+    ref: refs/heads/master
 
 jobs:
 
@@ -50,21 +51,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/
-          . ../../../../3_prepare_packages.sh
-          cd ../../
+          curl 'https://git.openwrt.org/?p=openwrt/openwrt.git;a=patch;h=22378beb581b113def1dc392ef75306a2168a163' | git apply --reject - || true
+          . ../../3_prepare_packages.sh
+          . ../../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