github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #41 from rprx/patch-1 

Adjust arm build
pull/2625/head
Kslr 2020-06-28 19:52:29 +08:00 committed by GitHub
parent 2008310a0a a2c86aaaeb
commit 9ae36dae05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
infra/control/main/targets.bzl
View File

@ -54,3 +54,35 @@ def gen_targets(matrix):
name = bin_name + "_sig", name = bin_name + "_sig",
base = ":" + bin_name, base = ":" + bin_name,
) )
bin_name = "v2ctl_" + os + "_" + arch + "_armv6"
foreign_go_binary(
name = bin_name,
pkg = pkg,
output = output + "_armv6",
os = os,
arch = arch,
arm = "6",
gotags = "confonly",
)
gpg_sign(
name = bin_name + "_sig",
base = ":" + bin_name,
)
bin_name = "v2ctl_" + os + "_" + arch + "_armv5"
foreign_go_binary(
name = bin_name,
pkg = pkg,
output = output,
os = os,
arch = arch,
arm = "5",
gotags = "confonly",
)
gpg_sign(
name = bin_name + "_sig",
base = ":" + bin_name,
)

8
main/targets.bzl
View File

@ -72,7 +72,7 @@ def gen_targets(matrix):
foreign_go_binary( foreign_go_binary(
name = bin_name, name = bin_name,
pkg = pkg, pkg = pkg,
output = "w" + output + "_armv5", output = "w" + output,
os = os, os = os,
arch = arch, arch = arch,
arm = "5", arm = "5",
@ -105,7 +105,7 @@ def gen_targets(matrix):
foreign_go_binary( foreign_go_binary(
name = bin_name, name = bin_name,
pkg = pkg, pkg = pkg,
output = output+"_armv7", output = output + "_armv7",
os = os, os = os,
arch = arch, arch = arch,
arm = "7", arm = "7",
@ -120,7 +120,7 @@ def gen_targets(matrix):
foreign_go_binary( foreign_go_binary(
name = bin_name, name = bin_name,
pkg = pkg, pkg = pkg,
output = output+"_armv6", output = output + "_armv6",
os = os, os = os,
arch = arch, arch = arch,
arm = "6", arm = "6",
@ -135,7 +135,7 @@ def gen_targets(matrix):
foreign_go_binary( foreign_go_binary(
name = bin_name, name = bin_name,
pkg = pkg, pkg = pkg,
output = output+"_armv5", output = output,
os = os, os = os,
arch = arch, arch = arch,
arm = "5", arm = "5",

18
release/BUILD
View File

@ -88,14 +88,12 @@ pkg_zip(
":config_json", ":config_json",
":doc", ":doc",
":geodata", ":geodata",
"//infra/control/main:v2ctl_windows_arm", "//infra/control/main:v2ctl_windows_arm_armv5",
"//infra/control/main:v2ctl_windows_arm_sig", "//infra/control/main:v2ctl_windows_arm_armv5_sig",
"//infra/control/main:v2ctl_windows_arm_armv6",
"//infra/control/main:v2ctl_windows_arm_armv6_sig",
"//infra/control/main:v2ctl_windows_arm_armv7", "//infra/control/main:v2ctl_windows_arm_armv7",
"//infra/control/main:v2ctl_windows_arm_armv7_sig", "//infra/control/main:v2ctl_windows_arm_armv7_sig",
"//main:v2ray_windows_arm",
"//main:v2ray_windows_arm_sig",
"//main:v2ray_windows_arm_nowindow",
"//main:v2ray_windows_arm_nowindow_sig",
"//main:v2ray_windows_arm_armv5", "//main:v2ray_windows_arm_armv5",
"//main:v2ray_windows_arm_armv5_sig", "//main:v2ray_windows_arm_armv5_sig",
"//main:v2ray_windows_arm_armv5_nowindow", "//main:v2ray_windows_arm_armv5_nowindow",
@ -227,12 +225,12 @@ pkg_zip(
":doc", ":doc",
":geodata", ":geodata",
":systemd", ":systemd",
"//infra/control/main:v2ctl_linux_arm", "//infra/control/main:v2ctl_linux_arm_armv5",
"//infra/control/main:v2ctl_linux_arm_armv5_sig",
"//infra/control/main:v2ctl_linux_arm_armv6",
"//infra/control/main:v2ctl_linux_arm_armv6_sig",
"//infra/control/main:v2ctl_linux_arm_armv7", "//infra/control/main:v2ctl_linux_arm_armv7",
"//infra/control/main:v2ctl_linux_arm_armv7_sig", "//infra/control/main:v2ctl_linux_arm_armv7_sig",
"//infra/control/main:v2ctl_linux_arm_sig",
"//main:v2ray_linux_arm",
"//main:v2ray_linux_arm_sig",
"//main:v2ray_linux_arm_armv5", "//main:v2ray_linux_arm_armv5",
"//main:v2ray_linux_arm_armv5_sig", "//main:v2ray_linux_arm_armv5_sig",
"//main:v2ray_linux_arm_armv6", "//main:v2ray_linux_arm_armv6",