diff --git a/Config/GENERAL.txt b/Config/GENERAL.txt index b2d9c3dc6b..1b89f826dc 100644 --- a/Config/GENERAL.txt +++ b/Config/GENERAL.txt @@ -1,3 +1,27 @@ +#科学插件调整 +CONFIG_PACKAGE_luci-app-homeproxy=y +#增加插件 +CONFIG_PACKAGE_luci-app-upnp=y +CONFIG_PACKAGE_luci-app-samba4=y +CONFIG_PACKAGE_luci-app-diskman=y +CONFIG_PACKAGE_luci-app-wolplus=y +CONFIG_PACKAGE_luci-app-tailscale=y +CONFIG_PACKAGE_luci-app-autoreboot=y +CONFIG_PACKAGE_luci-app-advancedplus=y +CONFIG_PACKAGE_luci-theme-kucat=y +#删除插件 +CONFIG_PACKAGE_luci-app-wol=n +CONFIG_PACKAGE_luci-app-ddns=n +CONFIG_PACKAGE_luci-app-vlmcsd=n +CONFIG_PACKAGE_luci-app-xlnetacc=n +CONFIG_PACKAGE_luci-app-zerotier=n +CONFIG_PACKAGE_luci-app-wireguard=n +CONFIG_PACKAGE_luci-app-ipsec-vpnd=n +CONFIG_PACKAGE_luci-app-adbyby-plus=n +CONFIG_PACKAGE_luci-app-filetransfer=n +CONFIG_PACKAGE_luci-app-unblockmusic=n +CONFIG_PACKAGE_luci-app-accesscontrol=n +CONFIG_PACKAGE_luci-app-fileassistant=n #参数调整 CONFIG_DEVEL=y CONFIG_CCACHE=y @@ -42,7 +66,6 @@ CONFIG_PACKAGE_block-mount=y CONFIG_PACKAGE_cpufreq=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_iperf3=y -CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_cfdisk=y CONFIG_PACKAGE_cgdisk=y CONFIG_PACKAGE_fdisk=y @@ -59,32 +82,3 @@ CONFIG_PACKAGE_luci-lib-base=y CONFIG_PACKAGE_luci-lib-ipkg=y CONFIG_PACKAGE_luci-lua-runtime=y CONFIG_PACKAGE_wpad-openssl=y -#科学插件调整 -CONFIG_PACKAGE_luci-app-homeproxy=y -#增加插件 -CONFIG_PACKAGE_luci-app-upnp=y -CONFIG_PACKAGE_luci-app-samba4=y -CONFIG_PACKAGE_luci-app-diskman=y -CONFIG_PACKAGE_luci-app-wolplus=y -CONFIG_PACKAGE_luci-app-tailscale=y -CONFIG_PACKAGE_luci-app-autoreboot=y -CONFIG_PACKAGE_luci-app-advancedplus=y -CONFIG_PACKAGE_luci-theme-kucat=y -CONFIG_PACKAGE_luci-theme-bootstrap=y -CONFIG_PACKAGE_luci-theme-bootstrap-mod=y -CONFIG_PACKAGE_luci-theme-material=y -CONFIG_PACKAGE_luci-theme-openwrt=y -CONFIG_PACKAGE_luci-theme-openwrt-2020=y -#删除插件 -CONFIG_PACKAGE_luci-app-wol=n -CONFIG_PACKAGE_luci-app-ddns=n -CONFIG_PACKAGE_luci-app-vlmcsd=n -CONFIG_PACKAGE_luci-app-xlnetacc=n -CONFIG_PACKAGE_luci-app-zerotier=n -CONFIG_PACKAGE_luci-app-wireguard=n -CONFIG_PACKAGE_luci-app-ipsec-vpnd=n -CONFIG_PACKAGE_luci-app-adbyby-plus=n -CONFIG_PACKAGE_luci-app-filetransfer=n -CONFIG_PACKAGE_luci-app-unblockmusic=n -CONFIG_PACKAGE_luci-app-accesscontrol=n -CONFIG_PACKAGE_luci-app-fileassistant=n diff --git a/Config/IPQ807X-WIFI-NO.txt b/Config/IPQ807X-WIFI-NO.txt index 2c58818510..8f183509df 100644 --- a/Config/IPQ807X-WIFI-NO.txt +++ b/Config/IPQ807X-WIFI-NO.txt @@ -19,3 +19,4 @@ CONFIG_PACKAGE_kmod-ath11k=n CONFIG_PACKAGE_kmod-ath11k-ahb=n CONFIG_PACKAGE_kmod-ath11k-pci=n CONFIG_PACKAGE_ath11k-firmware-ipq8074=n +CONFIG_PACKAGE_ath11k-firmware-qcn9074=n diff --git a/Config/IPQ807X-WIFI-YES.txt b/Config/IPQ807X-WIFI-YES.txt index 307458774f..e7b4936048 100644 --- a/Config/IPQ807X-WIFI-YES.txt +++ b/Config/IPQ807X-WIFI-YES.txt @@ -19,3 +19,4 @@ CONFIG_PACKAGE_kmod-ath11k=y CONFIG_PACKAGE_kmod-ath11k-ahb=y CONFIG_PACKAGE_kmod-ath11k-pci=y CONFIG_PACKAGE_ath11k-firmware-ipq8074=y +CONFIG_PACKAGE_ath11k-firmware-qcn9074=y diff --git a/Scripts/Handles.sh b/Scripts/Handles.sh index bc9636777b..59a7b7939c 100644 --- a/Scripts/Handles.sh +++ b/Scripts/Handles.sh @@ -72,3 +72,11 @@ if [ -f "$SP_FILE" ]; then cd $PKG_PATCH && echo "ssr-plus has been fixed!" fi + +#修复freeswitch依赖缺失 +FW_FILE=$(find ../feeds/telephony/ -maxdepth 3 -type f -wholename "*/freeswitch/Makefile") +if [ -f "$FW_FILE" ]; then + sed -i "s/libpcre/libpcre2/g" $FW_FILE + + cd $PKG_PATCH && echo "freeswitch has been fixed!" +fi diff --git a/Scripts/Settings.sh b/Scripts/Settings.sh index 818fbdab1e..c12209a463 100644 --- a/Scripts/Settings.sh +++ b/Scripts/Settings.sh @@ -26,10 +26,9 @@ if [ -n "$WRT_PACKAGE" ]; then echo "$WRT_PACKAGE" >> ./.config fi -#高通平台锁定512M内存 +#高通平台调整 if [[ $WRT_TARGET == *"IPQ"* ]]; then - echo "CONFIG_IPQ_MEM_PROFILE_1024=n" >> ./.config - echo "CONFIG_IPQ_MEM_PROFILE_512=y" >> ./.config - echo "CONFIG_ATH11K_MEM_PROFILE_1G=n" >> ./.config - echo "CONFIG_ATH11K_MEM_PROFILE_512M=y" >> ./.config + #取消nss相关feed + echo "CONFIG_FEED_nss_packages=n" >> ./.config + echo "CONFIG_FEED_sqm_scripts_nss=n" >> ./.config fi