Merge pull request #41 from rprx/patch-1

Adjust arm build

infra/control/main/targets.bzl

@@ -54,3 +54,35 @@ def gen_targets(matrix):
         name = bin_name + "_sig",
         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,
+      )

main/targets.bzl

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

release/BUILD

@@ -88,14 +88,12 @@ pkg_zip(
         ":config_json",
         ":doc",
         ":geodata",
-        "//infra/control/main:v2ctl_windows_arm",
-        "//infra/control/main:v2ctl_windows_arm_sig",
+        "//infra/control/main:v2ctl_windows_arm_armv5",
+        "//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_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_sig",
         "//main:v2ray_windows_arm_armv5_nowindow",
@@ -227,12 +225,12 @@ pkg_zip(
         ":doc",
         ":geodata",
         ":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_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_sig",
         "//main:v2ray_linux_arm_armv6",