Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15526 from 1715173329/xray-2102

Browse source 
[openwrt-21.02] xray-core: remove PROVIDES
This commit is contained in:
Rosen Penev 2021-04-28 17:25:53 -07:00 committed by GitHub
commit 8a692578c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/xray-core/Makefile
View file

@ -37,7 +37,6 @@ endef
define Package/xray-core
$(call Package/xray/template)
DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
PROVIDES:=v2ray-core
endef
define Package/xray-example
@ -55,7 +54,7 @@ define Package/xray-geodata
endef
define Package/xray/description
Xray, Penetrates Everything. Also the best v2ray-core, with XTLS support. Fully compatible configuration.
Xray, Penetrates Everything. It helps you to build your own computer network.
It secures your network connections and thus protects your privacy.
endef
@ -112,10 +111,9 @@ define Package/xray-core/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
$(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/xray
$(LN) xray $(1)/usr/bin/v2ray
$(INSTALL_DIR) $(1)/etc/xray/
$(INSTALL_CONF) $(CURDIR)/files/config.json.example $(1)/etc/xray/
$(INSTALL_DATA) $(CURDIR)/files/config.json.example $(1)/etc/xray/
$(INSTALL_DIR) $(1)/etc/config/
$(INSTALL_CONF) $(CURDIR)/files/xray.conf $(1)/etc/config/xray
@ -128,8 +126,8 @@ endef
define Package/xray-example/install
$(INSTALL_DIR) $(1)/etc/xray/
$(INSTALL_CONF) $(CURDIR)/files/vpoint_socks_vmess.json $(1)/etc/xray/
$(INSTALL_CONF) $(CURDIR)/files/vpoint_vmess_freedom.json $(1)/etc/xray/
$(INSTALL_DATA) $(CURDIR)/files/vpoint_socks_vmess.json $(1)/etc/xray/
$(INSTALL_DATA) $(CURDIR)/files/vpoint_vmess_freedom.json $(1)/etc/xray/
endef
define Package/xray-geodata/install

2
net/xray-core/files/config.json.example
View file

@ -1,6 +1,6 @@
// Config file of Xray. This file follows standard JSON format, with comments support.
// Uncomment entries below to satisfy your needs. Also read our manual for more detail at
// https://www.v2fly.org/en_US/config/overview.html and https://xray.sh/en/config/
// https://xtls.github.io/en/config/
{
"log": {
// By default, Xray writes access log to stdout.