From 6ebd87c669118a718221e69508c836f322462a48 Mon Sep 17 00:00:00 2001 From: KevinLiang10 Date: Fri, 30 Jun 2023 16:06:52 +0000 Subject: [PATCH] util/linuxfw: add new arch build constraints Exclide GOARCHs including: mips, mips64, mips64le, mipsle, riscv64. These archs are not supported by gvisor.dev/gvisor/pkg/hostarch. Fixes: #391 Signed-off-by: KevinLiang10 --- util/linuxfw/iptables.go | 3 ++- util/linuxfw/linuxfw_struct_linux_test.go | 3 ++- util/linuxfw/linuxfw_unsupported.go | 5 +++-- util/linuxfw/nftables.go | 3 ++- util/linuxfw/nftables_types.go | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/util/linuxfw/iptables.go b/util/linuxfw/iptables.go index 4930f68d1..e2657aace 100644 --- a/util/linuxfw/iptables.go +++ b/util/linuxfw/iptables.go @@ -1,7 +1,8 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64 || arm || armbe) +// TODO(#8502): add support for more architectures +//go:build linux && (arm64 || amd64) package linuxfw diff --git a/util/linuxfw/linuxfw_struct_linux_test.go b/util/linuxfw/linuxfw_struct_linux_test.go index 95141c8b9..769e3ae72 100644 --- a/util/linuxfw/linuxfw_struct_linux_test.go +++ b/util/linuxfw/linuxfw_struct_linux_test.go @@ -1,7 +1,8 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64 || arm || armbe) +// TODO(#8502): add support for more architectures +//go:build linux && (arm64 || amd64) package linuxfw diff --git a/util/linuxfw/linuxfw_unsupported.go b/util/linuxfw/linuxfw_unsupported.go index 84ba2ecbb..38a638d87 100644 --- a/util/linuxfw/linuxfw_unsupported.go +++ b/util/linuxfw/linuxfw_unsupported.go @@ -1,10 +1,11 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -// NOTE: linux_{386,loong64,arm,armbe} are currently unsupported due to missing +// NOTE: linux_{arm64, x86} are the only two currently supported archs due to missing // support in upstream dependencies. -//go:build !linux || (linux && (386 || loong64 || arm || armbe)) +// TODO(#8502): add support for more architectures +//go:build !linux || (linux && !(arm64 || amd64)) package linuxfw diff --git a/util/linuxfw/nftables.go b/util/linuxfw/nftables.go index cd41a5d9c..ce0b022fa 100644 --- a/util/linuxfw/nftables.go +++ b/util/linuxfw/nftables.go @@ -1,7 +1,8 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64 || arm || armbe) +// TODO(#8502): add support for more architectures +//go:build linux && (arm64 || amd64) package linuxfw diff --git a/util/linuxfw/nftables_types.go b/util/linuxfw/nftables_types.go index 90a70a8e1..b6e24d2a6 100644 --- a/util/linuxfw/nftables_types.go +++ b/util/linuxfw/nftables_types.go @@ -1,7 +1,8 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64 || arm || armbe) +// TODO(#8502): add support for more architectures +//go:build linux && (arm64 || amd64) package linuxfw