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

xray-core: use $(INSTALL_DATA) to install configuration files

Browse source 
Using `$(INSTALL_CONF)` will cause the program has no access to
configurations file when someone enabled the selinux support.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(backported from bbc6c62c2a)
This commit is contained in:
Tianling Shen 2021-04-27 19:51:57 +08:00
parent b75f619031
commit fee6ee1c8e
No known key found for this signature in database
GPG key ID: 6850B6345C862176
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/xray-core/Makefile
View file

@ -113,7 +113,7 @@ define Package/xray-core/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/xray $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/xray
$(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
@ -126,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_DATA) $(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_vmess_freedom.json $(1)/etc/xray/
endef endef
define Package/xray-geodata/install define Package/xray-geodata/install