Skip to content

Commit

Permalink
修复编译错误&更新配置
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenmozhijin
chenmozhijin committed Nov 20, 2023
1 parent 19583be commit 00ca57c
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 10 deletions.
4 changes: 4 additions & 0 deletions config/rpi4b/OpenWrt-K/extpackages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,7 @@ EXT_PACKAGES_NAME[29]="luci-app-openclash"
EXT_PACKAGES_PATH[29]="luci-app-openclash"
EXT_PACKAGES_REPOSITORIE[29]="https://github.com/vernesong/OpenClash"
EXT_PACKAGES_BRANCH[29]=""
EXT_PACKAGES_NAME[30]="wrtbwmon"
EXT_PACKAGES_PATH[30]="wrtbwmon"
EXT_PACKAGES_REPOSITORIE[30]="https://github.com/brvphoenix/wrtbwmon"
EXT_PACKAGES_BRANCH[30]=""
2 changes: 2 additions & 0 deletions config/rpi4b/kmod.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ CONFIG_PACKAGE_kmod-scsi-core=y
#
# Cryptographic API modules
#
CONFIG_PACKAGE_kmod-crypto-acompress=y
CONFIG_PACKAGE_kmod-crypto-aead=y
CONFIG_PACKAGE_kmod-crypto-arc4=y
CONFIG_PACKAGE_kmod-crypto-authenc=y
Expand Down Expand Up @@ -82,6 +83,7 @@ CONFIG_PACKAGE_kmod-asn1-decoder=y
CONFIG_PACKAGE_kmod-lib-cordic=y
CONFIG_PACKAGE_kmod-lib-crc16=y
CONFIG_PACKAGE_kmod-lib-crc8=y
CONFIG_PACKAGE_kmod-lib-lzo=y
CONFIG_PACKAGE_kmod-lib-raid6=y
CONFIG_PACKAGE_kmod-lib-textsearch=y
CONFIG_PACKAGE_kmod-lib-xor=y
Expand Down
7 changes: 4 additions & 3 deletions config/rpi4b/luci.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Server=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Server=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_GO=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_tuic_client=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Plugin=n
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=n
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Geodata=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y
# end of Configuration
CONFIG_PACKAGE_luci-app-passwall2=y
#
Expand All @@ -75,7 +75,6 @@ CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Server=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Server=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Server=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_tuic_client=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_V2ray_Plugin=n
# end of Configuration
CONFIG_PACKAGE_luci-app-rclone=y
CONFIG_PACKAGE_luci-app-samba4=y
Expand All @@ -88,6 +87,8 @@ CONFIG_PACKAGE_luci-app-usb-printer=y
CONFIG_PACKAGE_luci-app-vlmcsd=y
CONFIG_PACKAGE_luci-app-webadmin=y
CONFIG_PACKAGE_luci-app-wechatpush=y
CONFIG_PACKAGE_luci-app-wechatpush_Local_Disk_Information_Detection=y
CONFIG_PACKAGE_luci-app-wechatpush_Host_Information_Detection=y
CONFIG_PACKAGE_luci-app-wol=y
CONFIG_PACKAGE_luci-app-zerotier=y
# end of 3. Applications
Expand Down
11 changes: 9 additions & 2 deletions config/rpi4b/network.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ CONFIG_PACKAGE_p910nd=y
CONFIG_PACKAGE_ip-full=y
# end of Routing and Redirection
#
# SSH
#
CONFIG_PACKAGE_openssh-client=y
CONFIG_PACKAGE_openssh-keygen=y
# end of SSH
#
# VPN
#
CONFIG_PACKAGE_zerotier=y
Expand Down Expand Up @@ -114,7 +120,8 @@ CONFIG_PACKAGE_trojan-go=y
CONFIG_PACKAGE_tuic-client=y
CONFIG_PACKAGE_uhttpd=y
CONFIG_PACKAGE_uhttpd-mod-ubus=y
CONFIG_PACKAGE_xray-plugin=n
CONFIG_PACKAGE_v2ray-plugin=y
CONFIG_PACKAGE_xray-plugin=y
# end of Web Servers/Proxies
CONFIG_PACKAGE_6in4=y
CONFIG_PACKAGE_chat=y
Expand Down Expand Up @@ -155,5 +162,5 @@ CONFIG_PACKAGE_tcping=y
CONFIG_PACKAGE_trojan-plus=y
CONFIG_PACKAGE_vlmcsd=y
CONFIG_PACKAGE_wwan=y
CONFIG_PACKAGE_xray-core=n
CONFIG_PACKAGE_xray-core=y
# end of Network
1 change: 1 addition & 0 deletions config/rpi4b/utilities.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ CONFIG_PACKAGE_pciids=y
CONFIG_PACKAGE_pciutils=y
CONFIG_PACKAGE_qmi-utils=y
CONFIG_PACKAGE_smartmontools=y
CONFIG_PACKAGE_smartmontools-drivedb=y
CONFIG_PACKAGE_ucode-mod-html=y
CONFIG_PACKAGE_ucode-mod-lua=y
CONFIG_PACKAGE_usb-modeswitch=y
Expand Down
4 changes: 4 additions & 0 deletions config/x86_64/OpenWrt-K/extpackages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,7 @@ EXT_PACKAGES_NAME[29]="luci-app-openclash"
EXT_PACKAGES_PATH[29]="luci-app-openclash"
EXT_PACKAGES_REPOSITORIE[29]="https://github.com/vernesong/OpenClash"
EXT_PACKAGES_BRANCH[29]=""
EXT_PACKAGES_NAME[30]="wrtbwmon"
EXT_PACKAGES_PATH[30]="wrtbwmon"
EXT_PACKAGES_REPOSITORIE[30]="https://github.com/brvphoenix/wrtbwmon"
EXT_PACKAGES_BRANCH[30]=""
2 changes: 2 additions & 0 deletions config/x86_64/kmod.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ CONFIG_PACKAGE_kmod-scsi-core=y
#
# Cryptographic API modules
#
CONFIG_PACKAGE_kmod-crypto-acompress=y
CONFIG_PACKAGE_kmod-crypto-aead=y
CONFIG_PACKAGE_kmod-crypto-arc4=y
CONFIG_PACKAGE_kmod-crypto-authenc=y
Expand Down Expand Up @@ -77,6 +78,7 @@ CONFIG_PACKAGE_kmod-input-evdev=y
#
CONFIG_PACKAGE_kmod-asn1-decoder=y
CONFIG_PACKAGE_kmod-lib-crc16=y
CONFIG_PACKAGE_kmod-lib-lzo=y
CONFIG_PACKAGE_kmod-lib-raid6=y
CONFIG_PACKAGE_kmod-lib-textsearch=y
CONFIG_PACKAGE_kmod-lib-xor=y
Expand Down
7 changes: 4 additions & 3 deletions config/x86_64/luci.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Server=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Server=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_GO=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_tuic_client=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Plugin=n
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=n
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Geodata=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y
# end of Configuration
CONFIG_PACKAGE_luci-app-passwall2=y
#
Expand All @@ -77,7 +77,6 @@ CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Client=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Rust_Server=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Server=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_tuic_client=y
CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_V2ray_Plugin=n
# end of Configuration
CONFIG_PACKAGE_luci-app-rclone=y
CONFIG_PACKAGE_luci-app-samba4=y
Expand All @@ -90,6 +89,8 @@ CONFIG_PACKAGE_luci-app-usb-printer=y
CONFIG_PACKAGE_luci-app-vlmcsd=y
CONFIG_PACKAGE_luci-app-webadmin=y
CONFIG_PACKAGE_luci-app-wechatpush=y
CONFIG_PACKAGE_luci-app-wechatpush_Local_Disk_Information_Detection=y
CONFIG_PACKAGE_luci-app-wechatpush_Host_Information_Detection=y
CONFIG_PACKAGE_luci-app-wol=y
CONFIG_PACKAGE_luci-app-zerotier=y
# end of 3. Applications
Expand Down
11 changes: 9 additions & 2 deletions config/x86_64/network.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ CONFIG_PACKAGE_p910nd=y
CONFIG_PACKAGE_ip-full=y
# end of Routing and Redirection
#
# SSH
#
CONFIG_PACKAGE_openssh-client=y
CONFIG_PACKAGE_openssh-keygen=y
# end of SSH
#
# VPN
#
CONFIG_PACKAGE_zerotier=y
Expand Down Expand Up @@ -114,7 +120,8 @@ CONFIG_PACKAGE_trojan-go=y
CONFIG_PACKAGE_tuic-client=y
CONFIG_PACKAGE_uhttpd=y
CONFIG_PACKAGE_uhttpd-mod-ubus=y
CONFIG_PACKAGE_xray-plugin=n
CONFIG_PACKAGE_v2ray-plugin=y
CONFIG_PACKAGE_xray-plugin=y
# end of Web Servers/Proxies
#
# WirelessAPD
Expand Down Expand Up @@ -162,5 +169,5 @@ CONFIG_PACKAGE_tcping=y
CONFIG_PACKAGE_trojan-plus=y
CONFIG_PACKAGE_vlmcsd=y
CONFIG_PACKAGE_wwan=y
CONFIG_PACKAGE_xray-core=n
CONFIG_PACKAGE_xray-core=y
# end of Network
1 change: 1 addition & 0 deletions config/x86_64/other.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ CONFIG_GNUTLS_ANON=y
#
# Curves - unselect old or less-used curves to reduce binary size
#
CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=n
#
# Build Options - unselect features to reduce binary size
#
Expand Down
1 change: 1 addition & 0 deletions config/x86_64/utilities.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ CONFIG_PACKAGE_pciids=y
CONFIG_PACKAGE_pciutils=y
CONFIG_PACKAGE_qmi-utils=y
CONFIG_PACKAGE_smartmontools=y
CONFIG_PACKAGE_smartmontools-drivedb=y
CONFIG_PACKAGE_ucode-mod-html=y
CONFIG_PACKAGE_ucode-mod-lua=y
CONFIG_PACKAGE_usb-modeswitch=y
Expand Down
6 changes: 6 additions & 0 deletions scripts/fix_problem.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@ if [[ "$openwrt_tag_branch" == "v23.05.0-rc4" ]] ; then
echo "修复https://github.com/openwrt/packages/pull/22251"
curl -s -L --retry 6 https://github.com/openwrt/packages/commit/361b360d2bbf7abe93241f6eaa12320d8d83475a.patch | patch -p1 -d feeds/packages 2>/dev/null
fi
fi
if [[ "$openwrt_tag_branch" == "v23.05.2" ]] ; then
if grep -q "^GO_VERSION_MAJOR_MINOR:=1.21$" "feeds/packages/lang/golang/golang/Makefile" && grep -q "^GO_VERSION_PATCH:=3$" "feeds/packages/lang/golang/golang/Makefile"; then
echo "更新golang"
curl -s -L --retry 6 https://github.com/openwrt/packages/commit/413260559e7b830dedb47919f2b9e428cf11eb78.patch | patch -p1 -d feeds/packages 2>/dev/null
fi
fi

0 comments on commit 00ca57c

Please sign in to comment.