diff --git a/merge_packages.sh b/merge_packages.sh index ca5125d..a0c719a 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -13,8 +13,16 @@ function merge_package(){ fi mv $pn package/ } +function merge_feed(){ + if [ ! -d "feed/$1" ]; then + echo >> feeds.conf.default + echo "src-git $1 $2" >> feeds.conf.default + fi + ./scripts/feeds update $1 + ./scripts/feeds install -a -p $1 +} -merge_package https://github.com/linkease/ddnsto-openwrt +merge_feed nas "https://github.com/linkease/nas-packages.git;master" merge_package https://github.com/project-lede/luci-app-godproxy merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd luci-app-ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd diff --git a/r1p.config.seed b/r1p.config.seed index 1d6b0c8..d47db0b 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -16,15 +16,12 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adguardhome=y -CONFIG_PACKAGE_luci-app-appfilter=y CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y -CONFIG_PACKAGE_luci-app-baidupcs-web=y CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-ddns=y -CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y @@ -32,20 +29,15 @@ CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y -CONFIG_PACKAGE_luci-app-ipsec-vpnd=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y -CONFIG_PACKAGE_luci-app-mentohust=y +CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y -CONFIG_PACKAGE_luci-app-nft-qos=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-openclash=y -CONFIG_PACKAGE_luci-app-openvpn-server=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-serverchan=y CONFIG_PACKAGE_luci-app-services-wolplus=y CONFIG_PACKAGE_luci-app-smartdns=y -CONFIG_PACKAGE_luci-app-softethervpn=y CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-statistics=y CONFIG_PACKAGE_luci-app-tencentddns=y @@ -53,8 +45,6 @@ CONFIG_PACKAGE_luci-app-transmission=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-turboacc=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-app-udpxy=y -CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-usb-printer=y @@ -63,7 +53,6 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y -CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 4f51c18..b7c2b0e 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -25,8 +25,6 @@ CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y -CONFIG_PACKAGE_luci-app-nft-qos=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-serverchan=y CONFIG_PACKAGE_luci-app-services-wolplus=y CONFIG_PACKAGE_luci-app-smartdns=y @@ -35,15 +33,12 @@ CONFIG_PACKAGE_luci-app-tencentddns=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-turboacc=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-app-udpxy=y -CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-usb-printer=y CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y -CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/r1s.config.seed b/r1s.config.seed index f10265b..98910b2 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -25,8 +25,6 @@ CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y -CONFIG_PACKAGE_luci-app-nft-qos=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-serverchan=y CONFIG_PACKAGE_luci-app-services-wolplus=y CONFIG_PACKAGE_luci-app-smartdns=y @@ -35,15 +33,12 @@ CONFIG_PACKAGE_luci-app-tencentddns=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-turboacc=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-app-udpxy=y -CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-usb-printer=y CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y -CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/r2s.config.seed b/r2s.config.seed index 67ffe16..1603d2b 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -16,15 +16,12 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adguardhome=y -CONFIG_PACKAGE_luci-app-appfilter=y CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y -CONFIG_PACKAGE_luci-app-baidupcs-web=y CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-ddns=y -CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y @@ -32,20 +29,15 @@ CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y -CONFIG_PACKAGE_luci-app-ipsec-vpnd=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y -CONFIG_PACKAGE_luci-app-mentohust=y +CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y -CONFIG_PACKAGE_luci-app-nft-qos=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-openclash=y -CONFIG_PACKAGE_luci-app-openvpn-server=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-serverchan=y CONFIG_PACKAGE_luci-app-services-wolplus=y CONFIG_PACKAGE_luci-app-smartdns=y -CONFIG_PACKAGE_luci-app-softethervpn=y CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-statistics=y CONFIG_PACKAGE_luci-app-tencentddns=y @@ -53,8 +45,6 @@ CONFIG_PACKAGE_luci-app-transmission=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-turboacc=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-app-udpxy=y -CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-usb-printer=y @@ -63,7 +53,6 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y -CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y @@ -108,7 +97,6 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_rtl8822ce-firmware=y CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y diff --git a/r4s.config.seed b/r4s.config.seed index c3676ac..979aee4 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -16,15 +16,12 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adguardhome=y -CONFIG_PACKAGE_luci-app-appfilter=y CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y -CONFIG_PACKAGE_luci-app-baidupcs-web=y CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-ddns=y -CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y @@ -32,20 +29,15 @@ CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y -CONFIG_PACKAGE_luci-app-ipsec-vpnd=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y -CONFIG_PACKAGE_luci-app-mentohust=y +CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y -CONFIG_PACKAGE_luci-app-nft-qos=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-openclash=y -CONFIG_PACKAGE_luci-app-openvpn-server=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-serverchan=y CONFIG_PACKAGE_luci-app-services-wolplus=y CONFIG_PACKAGE_luci-app-smartdns=y -CONFIG_PACKAGE_luci-app-softethervpn=y CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-statistics=y CONFIG_PACKAGE_luci-app-tencentddns=y @@ -53,8 +45,6 @@ CONFIG_PACKAGE_luci-app-transmission=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-turboacc=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-app-udpxy=y -CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-usb-printer=y @@ -63,7 +53,6 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y -CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/x86.config.seed b/x86.config.seed index 58e17fd..dec10c2 100644 --- a/x86.config.seed +++ b/x86.config.seed @@ -17,42 +17,34 @@ CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adguardhome=y -CONFIG_PACKAGE_luci-app-appfilter=y CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y -CONFIG_PACKAGE_luci-app-baidupcs-web=y CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-ddns=y -CONFIG_PACKAGE_ddnsto=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-dockerman=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-godproxy=y -CONFIG_PACKAGE_luci-app-ipsec-vpnd=y CONFIG_PACKAGE_luci-app-jd-dailybonus=y -CONFIG_PACKAGE_luci-app-mentohust=y +CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y -CONFIG_PACKAGE_luci-app-nft-qos=y -CONFIG_PACKAGE_luci-app-nlbwmon=y CONFIG_PACKAGE_luci-app-openclash=y -CONFIG_PACKAGE_luci-app-openvpn-server=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-serverchan=y CONFIG_PACKAGE_luci-app-services-wolplus=y CONFIG_PACKAGE_luci-app-smartdns=y -CONFIG_PACKAGE_luci-app-softethervpn=y CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-statistics=y +CONFIG_PACKAGE_luci-app-tencentddns=y CONFIG_PACKAGE_luci-app-transmission=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-turboacc=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-app-udpxy=y -CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-upnp=y CONFIG_PACKAGE_luci-app-usb-printer=y @@ -61,7 +53,6 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y -CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y @@ -102,9 +93,8 @@ CONFIG_PACKAGE_kmod-ath9k-htc=y CONFIG_PACKAGE_kmod-mt76x0u=y CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y -CONFIG_PACKAGE_kmod-rtl88x2bu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y -CONFIG_PACKAGE_rtl8822ce-firmware=y +CONFIG_PACKAGE_kmod-rtl88x2bu=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y