Browse Source

Merge pull request #15525 from 1715173329/xray

xray-core: remove PROVIDES
lilik-openwrt-22.03
Josef Schlehofer 3 years ago
committed by GitHub
parent
commit
6666a70b74
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
  1. +4
    -6
      net/xray-core/Makefile
  2. +1
    -1
      net/xray-core/files/config.json.example

+ 4
- 6
net/xray-core/Makefile View File

@ -37,7 +37,6 @@ endef
define Package/xray-core define Package/xray-core
$(call Package/xray/template) $(call Package/xray/template)
DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
PROVIDES:=v2ray-core
endef endef
define Package/xray-example define Package/xray-example
@ -55,7 +54,7 @@ define Package/xray-geodata
endef endef
define Package/xray/description 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. It secures your network connections and thus protects your privacy.
endef endef
@ -112,10 +111,9 @@ define Package/xray-core/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
$(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/xray $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/xray
$(LN) xray $(1)/usr/bin/v2ray
$(INSTALL_DIR) $(1)/etc/xray/ $(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_DIR) $(1)/etc/config/
$(INSTALL_CONF) $(CURDIR)/files/xray.conf $(1)/etc/config/xray $(INSTALL_CONF) $(CURDIR)/files/xray.conf $(1)/etc/config/xray
@ -128,8 +126,8 @@ endef
define Package/xray-example/install define Package/xray-example/install
$(INSTALL_DIR) $(1)/etc/xray/ $(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 endef
define Package/xray-geodata/install define Package/xray-geodata/install


+ 1
- 1
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. // 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 // 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": { "log": {
// By default, Xray writes access log to stdout. // By default, Xray writes access log to stdout.


Loading…
Cancel
Save