From: Tianling Shen Date: Tue, 27 Apr 2021 11:51:57 +0000 (+0800) Subject: xray-core: use `$(INSTALL_DATA)` to install configuration files X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fee6ee1c8ec2f6681f0ebc2fb6288048abbfc3cf;p=feed%2Fpackages.git xray-core: use `$(INSTALL_DATA)` to install configuration files Using `$(INSTALL_CONF)` will cause the program has no access to configurations file when someone enabled the selinux support. Signed-off-by: Tianling Shen (backported from bbc6c62c2a029fd716b2bcad68ed3f99478da246) --- diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index 0db91efa3d..1fac4a3126 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -113,7 +113,7 @@ define Package/xray-core/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/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_CONF) $(CURDIR)/files/xray.conf $(1)/etc/config/xray @@ -126,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