Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
openwrt-packages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Feed
openwrt-packages
Commits
6666a70b
Unverified
Commit
6666a70b
authored
3 years ago
by
Josef Schlehofer
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #15525 from 1715173329/xray
xray-core: remove PROVIDES
parents
b0870d79
bbc6c62c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!13
Uplift of packages using two step method. Use commits specified by feeds.conf.default from main repo.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
net/xray-core/Makefile
+4
-6
4 additions, 6 deletions
net/xray-core/Makefile
net/xray-core/files/config.json.example
+1
-1
1 addition, 1 deletion
net/xray-core/files/config.json.example
with
5 additions
and
7 deletions
net/xray-core/Makefile
+
4
−
6
View file @
6666a70b
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
net/xray-core/files/config.json.example
+
1
−
1
View file @
6666a70b
// 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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment