update

.github/workflows/repo-dispatcher.yml

@@ -58,4 +58,9 @@ jobs:
         -H "Accept: application/vnd.github.everest-preview+json" \
         -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
         -d '{"event_type": "nanopi-r2s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r2s"}}'
+        curl \
+        -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+        -H "Accept: application/vnd.github.everest-preview+json" \
+        -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+        -d '{"event_type": "nanopi-r4s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r4s"}}'
 

README.md

@@ -69,8 +69,8 @@ diy云编译教程: [Read the details in my blog (in Chinese) | 中文教程](ht
 ### 默认插件包含:
 
 + Opkg 软件包管理
-+ SSR-PLUS
-+ Adblock 基于DNS的广告过滤
++ Bypass 智能过墙
++ DNSfilter 基于DNS的广告过滤
 + UPNP 自动端口转发
 + Turbo ACC 网络加速
 

devices/common/.config

@@ -102,9 +102,6 @@ CONFIG_PACKAGE_kmod-pptp=n
 CONFIG_PACKAGE_kmod-gre=n
 CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
 
-# phtunnel
-CONFIG_PACKAGE_kmod-crypto-null=y
-
 # ipsec-vpnd
 CONFIG_PACKAGE_kmod-crypto-authenc=y
 CONFIG_PACKAGE_kmod-ipsec=y

devices/common/diy.sh

@@ -67,6 +67,7 @@ if [ -f sdk.tar.xz ]; then
 	tar -xJf sdk.tar.xz -C sdk
 	cp -rf sdk/*/staging_dir/* ./staging_dir/
 	rm -rf sdk.tar.xz sdk
+	find "staging_dir/host/" -maxdepth 2 -name 'libelf*' | xargs -i rm -rf {} || true
 	sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile
 	if [ -f /usr/bin/python ]; then
 		ln -sf /usr/bin/python staging_dir/host/bin/python

devices/common/patches/opkginstall.patch

@@ -9,7 +9,7 @@
  						opkg="$opkg $1"
  						shift
  					;;
-@@ -34,6 +34,11 @@ case "$action" in
+@@ -34,6 +34,12 @@ case "$action" in
  
  			if flock -x 200; then
  				$opkg $action "$@" </dev/null >/tmp/opkg.out 2>/tmp/opkg.err
@@ -17,6 +17,7 @@
 +				sed -i "/uci: Entry not found/d" /tmp/opkg.err || true
 +				sed -i "/Existing conffile/d" /tmp/opkg.err || true
 +				sed -i "/Couldn't unlink/d" /tmp/opkg.err || true
++				sed -i "/pkg_hash_check_unresolved/d" /tmp/opkg.err || true
 +				[ "`cat /tmp/opkg.err`" == "Collected errors:" ] && rm -f /tmp/opkg.err || true
  				code=$?
  				stdout=$(cat /tmp/opkg.out)