From 6ecc0c3c0f6be6b4914b3fb0b8a714c05cca1655 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 9 Apr 2018 21:44:37 +0800 Subject: [PATCH] clean v2ray makefiel conflict - need to be fix --- package/ext/luci-app-shadowsocksr | 1 - package/lean/luci-app-v2ray/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 160000 package/ext/luci-app-shadowsocksr diff --git a/package/ext/luci-app-shadowsocksr b/package/ext/luci-app-shadowsocksr deleted file mode 160000 index 86ef75ed8..000000000 --- a/package/ext/luci-app-shadowsocksr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 86ef75ed8a376ca0a7490ce68c5b09fa0fbe8c1d diff --git a/package/lean/luci-app-v2ray/Makefile b/package/lean/luci-app-v2ray/Makefile index bc0b9d578..b8ebdba75 100644 --- a/package/lean/luci-app-v2ray/Makefile +++ b/package/lean/luci-app-v2ray/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for V2Ray -LUCI_DEPENDS:=+iptables-mod-tproxy +kmod-ipt-tproxy +ip +ipset-lists +pdnsd-alt +coreutils +coreutils-base64 +coreutils-nohup +dnsmasq-full +ca-certificates +v2ray +luci-lib-jsonc +LUCI_DEPENDS:=+iptables-mod-tproxy +kmod-ipt-tproxy +ip +ipset-lists +pdnsd-alt +coreutils +coreutils-base64 +coreutils-nohup +dnsmasq-full +ca-certificates +v2ray LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(TOPDIR)/feeds/luci/luci.mk