From af6bbf1d8a7bf1780f1164b6df2be27ad1806487 Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Sat, 8 Oct 2022 11:00:28 +0800 Subject: [PATCH 1/5] fix pkg download --- SCRIPTS/02_prepare_package.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh index 568205ea5..f1cdc5325 100644 --- a/SCRIPTS/02_prepare_package.sh +++ b/SCRIPTS/02_prepare_package.sh @@ -258,8 +258,8 @@ svn export https://github.com/immortalwrt/packages/trunk/utils/cpulimit feeds/pa ln -sf ../../../feeds/packages/utils/cpulimit ./package/feeds/packages/cpulimit # 动态DNS sed -i '/boot()/,+2d' feeds/packages/net/ddns-scripts/files/etc/init.d/ddns -svn export https://github.com/linkease/istore-packages/trunk/ddns-scripts_dnspod package/lean/ddns-scripts_dnspod -svn export https://github.com/linkease/istore-packages/trunk/ddns-scripts_aliyun package/lean/ddns-scripts_aliyun +svn export https://github.com/immortalwrt/packages/branches/openwrt-21.02/net/ddns-scripts_aliyun feeds/packages/net/ddns-scripts_aliyun +svn export https://github.com/immortalwrt/packages/branches/openwrt-21.02/net/ddns-scripts_dnspod feeds/packages/net/ddns-scripts_dnspod svn export https://github.com/QiuSimons/OpenWrt_luci-app/trunk/luci-app-tencentddns package/lean/luci-app-tencentddns svn export https://github.com/kenzok8/openwrt-packages/trunk/luci-app-aliddns feeds/luci/applications/luci-app-aliddns ln -sf ../../../feeds/luci/applications/luci-app-aliddns ./package/feeds/luci/luci-app-aliddns @@ -459,7 +459,7 @@ ln -sf ../../../feeds/packages/libs/toml11 ./package/feeds/packages/toml11 # 网易云音乐解锁 git clone -b js --depth 1 https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic.git package/new/UnblockNeteaseMusic # ucode -svn export https://github.com/openwrt/openwrt/trunk/package/utils/ucode package/utils/ucode +#svn export https://github.com/openwrt/openwrt/trunk/package/utils/ucode package/utils/ucode # USB 打印机 svn export https://github.com/coolsnowwolf/luci/trunk/applications/luci-app-usb-printer package/lean/luci-app-usb-printer # UU加速器 @@ -485,7 +485,7 @@ git clone -b master --depth 1 https://github.com/brvphoenix/luci-app-wrtbwmon.gi # 迅雷快鸟宽带加速 git clone --depth 1 https://github.com/kiddin9/luci-app-xlnetacc.git package/lean/luci-app-xlnetacc # Zerotier -svn export https://github.com/immortalwrt/luci/branches/master/applications/luci-app-zerotier feeds/luci/applications/luci-app-zerotier +svn export https://github.com/immortalwrt/luci/trunk/applications/luci-app-zerotier feeds/luci/applications/luci-app-zerotier #svn export https://github.com/wongsyrone/lede-1/trunk/package/external/luci-app-zerotier feeds/luci/applications/luci-app-zerotier #svn export https://github.com/immortalwrt/luci/trunk/applications/luci-app-zerotier feeds/luci/applications/luci-app-zerotier wget -P feeds/luci/applications/luci-app-zerotier/ https://github.com/QiuSimons/OpenWrt-Add/raw/master/move_2_services.sh @@ -495,7 +495,7 @@ bash move_2_services.sh popd ln -sf ../../../feeds/luci/applications/luci-app-zerotier ./package/feeds/luci/luci-app-zerotier rm -rf ./feeds/packages/net/zerotier -svn export https://github.com/immortalwrt/packages/branches/master/net/zerotier feeds/packages/net/zerotier +svn export https://github.com/immortalwrt/packages/trunk/net/zerotier feeds/packages/net/zerotier #sed -i '/Default,one/a\\t$(STAGING_DIR_HOST)/bin/upx --lzma --best $(PKG_BUILD_DIR)/zerotier-one' feeds/packages/net/zerotier/Makefile #jq sed -i 's,9625784cf2e4fd9842f1d407681ce4878b5b0dcddbcd31c6135114a30c71e6a8,skip,g' feeds/packages/utils/jq/Makefile From 1a9e8af4896682ae2ad5f3f5c35c896abc2160e7 Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Sun, 9 Oct 2022 15:25:32 +0800 Subject: [PATCH 2/5] Revert "disable bbr2 due to #472" This reverts commit 2b0c9bee55793efe4eee0744d7f557c7bbc4c8dd. --- SEED/R2C/config.seed | 2 +- SEED/R2S/config.seed | 2 +- SEED/R4S/config.seed | 2 +- SEED/X86/config.seed | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SEED/R2C/config.seed b/SEED/R2C/config.seed index 1e8adb66a..8e6beed30 100644 --- a/SEED/R2C/config.seed +++ b/SEED/R2C/config.seed @@ -153,7 +153,7 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y CONFIG_PACKAGE_kmod-usb-net-ipheth=y ### BBRv2 ### -#CONFIG_PACKAGE_kmod-tcp-bbr2=y +CONFIG_PACKAGE_kmod-tcp-bbr2=y ### OPENSSL ### CONFIG_OPENSSL_ENGINE=y diff --git a/SEED/R2S/config.seed b/SEED/R2S/config.seed index 502dca03d..c618d38a4 100644 --- a/SEED/R2S/config.seed +++ b/SEED/R2S/config.seed @@ -153,7 +153,7 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y CONFIG_PACKAGE_kmod-usb-net-ipheth=y ### BBRv2 ### -#CONFIG_PACKAGE_kmod-tcp-bbr2=y +CONFIG_PACKAGE_kmod-tcp-bbr2=y ### OPENSSL ### CONFIG_OPENSSL_ENGINE=y diff --git a/SEED/R4S/config.seed b/SEED/R4S/config.seed index 78a4a0430..49bf3bb60 100644 --- a/SEED/R4S/config.seed +++ b/SEED/R4S/config.seed @@ -153,7 +153,7 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y CONFIG_PACKAGE_kmod-usb-net-ipheth=y ### BBRv2 ### -#CONFIG_PACKAGE_kmod-tcp-bbr2=y +CONFIG_PACKAGE_kmod-tcp-bbr2=y ### OPENSSL ### CONFIG_OPENSSL_ENGINE=y diff --git a/SEED/X86/config.seed b/SEED/X86/config.seed index 239f3fa5b..fb89fdbd2 100644 --- a/SEED/X86/config.seed +++ b/SEED/X86/config.seed @@ -153,7 +153,7 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y CONFIG_PACKAGE_kmod-usb-net-ipheth=y ### BBRv2 ### -#CONFIG_PACKAGE_kmod-tcp-bbr2=y +CONFIG_PACKAGE_kmod-tcp-bbr2=y ### OPENSSL ### CONFIG_OPENSSL_ENGINE=y From 26a57455813db6ed0e5e05de5964ed1053d18a62 Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Mon, 10 Oct 2022 11:50:10 +0800 Subject: [PATCH 3/5] fix socat config --- SCRIPTS/02_prepare_package.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh index f1cdc5325..5d0301ca4 100644 --- a/SCRIPTS/02_prepare_package.sh +++ b/SCRIPTS/02_prepare_package.sh @@ -437,6 +437,7 @@ svn export https://github.com/openwrt/packages/trunk/net/v2raya feeds/packages/n ln -sf ../../../feeds/packages/net/v2raya ./package/feeds/packages/v2raya # socat svn export https://github.com/Lienol/openwrt-package/trunk/luci-app-socat package/new/luci-app-socat +sed -i '/socat\.config/d' feeds/packages/net/socat/Makefile # 订阅转换 svn export https://github.com/immortalwrt/packages/trunk/net/subconverter feeds/packages/net/subconverter #wget https://github.com/immortalwrt/packages/raw/b7b4499/net/subconverter/Makefile -O feeds/packages/net/subconverter/Makefile From 41b434fc4a36734a1807e8e69c396d8b60fe4762 Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Mon, 10 Oct 2022 12:12:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BE=88=E6=83=AD=E6=84=A7=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E5=81=9A=E4=BA=86=E4=B8=80=E7=82=B9=E5=BE=AE=E5=B0=8F?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SCRIPTS/02_prepare_package.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh index 5d0301ca4..8740b9f36 100644 --- a/SCRIPTS/02_prepare_package.sh +++ b/SCRIPTS/02_prepare_package.sh @@ -563,8 +563,7 @@ CONFIG_NFSD=y ' >>./target/linux/generic/config-5.10 ### Shortcut-FE 部分 ### # Patch Kernel 以支持 Shortcut-FE -#wget -P target/linux/generic/hack-5.10/ https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch -wget -P target/linux/generic/hack-5.10/ https://github.com/coolsnowwolf/lede/raw/2b04e06/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +wget -P target/linux/generic/hack-5.10/ https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch # Patch LuCI 以增添 Shortcut-FE 开关 patch -p1 < ../PATCH/firewall/luci-app-firewall_add_sfe_switch.patch # Shortcut-FE 相关组件 From 08bf63ea568a14ec3ba691962104cec0423b10ef Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Wed, 12 Oct 2022 11:00:15 +0800 Subject: [PATCH 5/5] opkg got Segmentation fault due to upstream problem --- SEED/R2C/config.seed | 1 + SEED/R2S/config.seed | 1 + SEED/R4S/config.seed | 1 + SEED/X86/config.seed | 1 + 4 files changed, 4 insertions(+) diff --git a/SEED/R2C/config.seed b/SEED/R2C/config.seed index 8e6beed30..939984545 100644 --- a/SEED/R2C/config.seed +++ b/SEED/R2C/config.seed @@ -189,3 +189,4 @@ CONFIG_DOCKER_STO_EXT4=y ### KMOD ##(opkg got Segmentation fault due to upstream problem) CONFIG_PACKAGE_kmod-mt76x2=y CONFIG_PACKAGE_kmod-fs-nfs-common=y +CONFIG_PACKAGE_kmod-sctp=y diff --git a/SEED/R2S/config.seed b/SEED/R2S/config.seed index c618d38a4..5e9fdf2b2 100644 --- a/SEED/R2S/config.seed +++ b/SEED/R2S/config.seed @@ -189,3 +189,4 @@ CONFIG_DOCKER_STO_EXT4=y ### KMOD ##(opkg got Segmentation fault due to upstream problem) CONFIG_PACKAGE_kmod-mt76x2=y CONFIG_PACKAGE_kmod-fs-nfs-common=y +CONFIG_PACKAGE_kmod-sctp=y diff --git a/SEED/R4S/config.seed b/SEED/R4S/config.seed index 49bf3bb60..24514c759 100644 --- a/SEED/R4S/config.seed +++ b/SEED/R4S/config.seed @@ -189,3 +189,4 @@ CONFIG_DOCKER_STO_EXT4=y ### KMOD ##(opkg got Segmentation fault due to upstream problem) CONFIG_PACKAGE_kmod-mt76x2=y CONFIG_PACKAGE_kmod-fs-nfs-common=y +CONFIG_PACKAGE_kmod-sctp=y diff --git a/SEED/X86/config.seed b/SEED/X86/config.seed index fb89fdbd2..8ff862481 100644 --- a/SEED/X86/config.seed +++ b/SEED/X86/config.seed @@ -185,3 +185,4 @@ CONFIG_DOCKER_STO_EXT4=y ### KMOD ##(opkg got Segmentation fault due to upstream problem) CONFIG_PACKAGE_kmod-mt76x2=y CONFIG_PACKAGE_kmod-fs-nfs-common=y +CONFIG_PACKAGE_kmod-sctp=y