diff --git a/common.seed b/common.seed index c4b71fe0c2..fe9c3601ce 100644 --- a/common.seed +++ b/common.seed @@ -46,7 +46,7 @@ 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-xfrpc=y +CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-xlnetacc=y CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-lib-json=y diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index 741c1caa4d..2a35f259be 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -38,7 +38,6 @@ rm -r package/feeds/nas_luci/luci-app-ddnsto merge_feed helloworld "https://github.com/stupidloud/helloworld;tmp" merge_package https://github.com/ilxp/luci-app-ikoolproxy merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-wolplus -merge_package https://github.com/liudf0716/luci-app-xfrpc && sed -i 's/\.\.\/\.\.\/luci/$(TOPDIR)\/feeds\/luci\/luci/' package/custom/luci-app-xfrpc/Makefile merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/aliyundrive-webdav merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/luci-app-aliyundrive-webdav merge_package "-b 18.06 https://github.com/jerrykuku/luci-theme-argon"