From 6927a844b157d4ce8aa07ff737975bd606436f03 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Mon, 13 Feb 2023 22:56:28 -0700 Subject: [PATCH] util/linuxfw: add build constraints excluding GOARCH=arm This isn't currently supported due to missing support in upstream dependencies, and also we don't use this package anywhere right now. Just conditionally skip this for now. Fixes #7268 Change-Id: Ie7389c2c0816b39b410c02a7276051a4c18b6450 Signed-off-by: Andrew Dunham --- util/linuxfw/iptables.go | 2 +- util/linuxfw/linuxfw_struct_linux_test.go | 2 +- util/linuxfw/linuxfw_unsupported.go | 4 ++-- util/linuxfw/nftables.go | 2 +- util/linuxfw/nftables_types.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util/linuxfw/iptables.go b/util/linuxfw/iptables.go index 6e7633215..4930f68d1 100644 --- a/util/linuxfw/iptables.go +++ b/util/linuxfw/iptables.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64) +//go:build linux && !(386 || loong64 || arm || armbe) package linuxfw diff --git a/util/linuxfw/linuxfw_struct_linux_test.go b/util/linuxfw/linuxfw_struct_linux_test.go index ae9a2f7e5..95141c8b9 100644 --- a/util/linuxfw/linuxfw_struct_linux_test.go +++ b/util/linuxfw/linuxfw_struct_linux_test.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64) +//go:build linux && !(386 || loong64 || arm || armbe) package linuxfw diff --git a/util/linuxfw/linuxfw_unsupported.go b/util/linuxfw/linuxfw_unsupported.go index 819d39ca5..246b61147 100644 --- a/util/linuxfw/linuxfw_unsupported.go +++ b/util/linuxfw/linuxfw_unsupported.go @@ -1,10 +1,10 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -// NOTE: linux_386 and linux_loong64 are currently unsupported due to missing +// NOTE: linux_{386,loong64,arm,armbe} are currently unsupported due to missing // support in upstream dependencies. -//go:build !linux || (linux && (386 || loong64)) +//go:build !linux || (linux && (386 || loong64 || arm || armbe)) package linuxfw diff --git a/util/linuxfw/nftables.go b/util/linuxfw/nftables.go index 35205975a..066ce12a1 100644 --- a/util/linuxfw/nftables.go +++ b/util/linuxfw/nftables.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64) +//go:build linux && !(386 || loong64 || arm || armbe) package linuxfw diff --git a/util/linuxfw/nftables_types.go b/util/linuxfw/nftables_types.go index 7af23baa1..90a70a8e1 100644 --- a/util/linuxfw/nftables_types.go +++ b/util/linuxfw/nftables_types.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux && !(386 || loong64) +//go:build linux && !(386 || loong64 || arm || armbe) package linuxfw