From dbb9fc03ae59610bbd404f209d059790227ded04 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 30 Aug 2021 20:43:12 -0700
Subject: [PATCH] libct/*: remove linux build tag from some pkgs

Only some libcontainer packages can be built on non-linux platforms
(not that it make sense, but at least go build succeeds). Let's call
these "good" packages.

For all other packages (i.e. ones that fail to build with GOOS other
than linux), it does not make sense to have linux build tag (as they
are broken already, and thus are not and can not be used on anything
other than Linux).

Remove linux build tag for all non-"good" packages.

This was mostly done by the following script, with just a few manual
fixes on top.

function list_good_pkgs() {
	for pkg in $(find . -type d -print); do
		GOOS=freebsd go build $pkg 2>/dev/null \
		&& GOOS=solaris go build $pkg 2>/dev/null \
		&& echo $pkg
	done | sed -e 's|^./||' | tr '\n' '|' | sed -e 's/|$//'
}

function remove_tag() {
	sed -i -e '\|^// +build linux$|d' $1
	go fmt $1
}

SKIP="^("$(list_good_pkgs)")"
for f in $(git ls-files . | grep .go$); do
	if echo $f | grep -qE "$SKIP"; then
		echo skip $f
		continue
	fi
	echo proc $f
	remove_tag $f
done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 libcontainer/cgroups/cgroups.go                  | 2 --
 libcontainer/cgroups/cgroups_test.go             | 2 --
 libcontainer/cgroups/devices/devices_emulator.go | 2 --
 libcontainer/cgroups/file_test.go                | 2 --
 libcontainer/cgroups/fs/blkio.go                 | 2 --
 libcontainer/cgroups/fs/blkio_test.go            | 2 --
 libcontainer/cgroups/fs/cpu.go                   | 2 --
 libcontainer/cgroups/fs/cpu_test.go              | 2 --
 libcontainer/cgroups/fs/cpuacct.go               | 2 --
 libcontainer/cgroups/fs/cpuacct_test.go          | 2 --
 libcontainer/cgroups/fs/cpuset.go                | 2 --
 libcontainer/cgroups/fs/cpuset_test.go           | 2 --
 libcontainer/cgroups/fs/devices.go               | 2 --
 libcontainer/cgroups/fs/devices_test.go          | 2 --
 libcontainer/cgroups/fs/freezer.go               | 2 --
 libcontainer/cgroups/fs/freezer_test.go          | 2 --
 libcontainer/cgroups/fs/fs.go                    | 2 --
 libcontainer/cgroups/fs/fs_test.go               | 2 --
 libcontainer/cgroups/fs/hugetlb.go               | 2 --
 libcontainer/cgroups/fs/hugetlb_test.go          | 2 --
 libcontainer/cgroups/fs/memory.go                | 2 --
 libcontainer/cgroups/fs/memory_test.go           | 2 --
 libcontainer/cgroups/fs/name.go                  | 2 --
 libcontainer/cgroups/fs/net_cls.go               | 2 --
 libcontainer/cgroups/fs/net_cls_test.go          | 2 --
 libcontainer/cgroups/fs/net_prio.go              | 2 --
 libcontainer/cgroups/fs/net_prio_test.go         | 2 --
 libcontainer/cgroups/fs/perf_event.go            | 2 --
 libcontainer/cgroups/fs/pids.go                  | 2 --
 libcontainer/cgroups/fs/pids_test.go             | 2 --
 libcontainer/cgroups/fs/stats_util_test.go       | 2 --
 libcontainer/cgroups/fs/util_test.go             | 2 --
 libcontainer/cgroups/fs2/cpu.go                  | 2 --
 libcontainer/cgroups/fs2/cpuset.go               | 2 --
 libcontainer/cgroups/fs2/devices.go              | 2 --
 libcontainer/cgroups/fs2/freezer.go              | 2 --
 libcontainer/cgroups/fs2/fs2.go                  | 2 --
 libcontainer/cgroups/fs2/hugetlb.go              | 2 --
 libcontainer/cgroups/fs2/io.go                   | 2 --
 libcontainer/cgroups/fs2/memory.go               | 2 --
 libcontainer/cgroups/fs2/pids.go                 | 2 --
 libcontainer/cgroups/fscommon/utils.go           | 2 --
 libcontainer/cgroups/fscommon/utils_test.go      | 2 --
 libcontainer/cgroups/getallpids.go               | 3 ++-
 libcontainer/cgroups/getallpids_go115.go         | 2 +-
 libcontainer/cgroups/getallpids_test.go          | 2 --
 libcontainer/cgroups/stats.go                    | 2 --
 libcontainer/cgroups/systemd/dbus.go             | 2 --
 libcontainer/cgroups/systemd/user.go             | 2 --
 libcontainer/cgroups/systemd/v1.go               | 2 --
 libcontainer/cgroups/systemd/v2.go               | 2 --
 libcontainer/cgroups/utils.go                    | 2 --
 libcontainer/cgroups/utils_test.go               | 2 --
 libcontainer/intelrdt/intelrdt.go                | 2 --
 libcontainer/intelrdt/intelrdt_test.go           | 2 --
 libcontainer/intelrdt/mbm.go                     | 2 --
 libcontainer/intelrdt/mbm_test.go                | 2 --
 libcontainer/intelrdt/stats.go                   | 2 --
 libcontainer/intelrdt/util_test.go               | 2 --
 libcontainer/keys/keyctl.go                      | 2 --
 libcontainer/restored_process.go                 | 2 --
 libcontainer/utils/cmsg.go                       | 2 --
 62 files changed, 3 insertions(+), 122 deletions(-)

diff --git a/libcontainer/cgroups/cgroups.go b/libcontainer/cgroups/cgroups.go
index 68a346ca5..ba2b2266c 100644
--- a/libcontainer/cgroups/cgroups.go
+++ b/libcontainer/cgroups/cgroups.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git a/libcontainer/cgroups/cgroups_test.go b/libcontainer/cgroups/cgroups_test.go
index 9efb83ec5..b31412f5a 100644
--- a/libcontainer/cgroups/cgroups_test.go
+++ b/libcontainer/cgroups/cgroups_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git a/libcontainer/cgroups/devices/devices_emulator.go b/libcontainer/cgroups/devices/devices_emulator.go
index d50fc91b4..97ba3f821 100644
--- a/libcontainer/cgroups/devices/devices_emulator.go
+++ b/libcontainer/cgroups/devices/devices_emulator.go
@@ -1,5 +1,3 @@
-// +build linux
-
 // SPDX-License-Identifier: Apache-2.0
 /*
  * Copyright (C) 2020 Aleksa Sarai <cyphar@cyphar.com>
diff --git a/libcontainer/cgroups/file_test.go b/libcontainer/cgroups/file_test.go
index 4b2cb8950..0a5b941fa 100644
--- a/libcontainer/cgroups/file_test.go
+++ b/libcontainer/cgroups/file_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git a/libcontainer/cgroups/fs/blkio.go b/libcontainer/cgroups/fs/blkio.go
index 5e1b42a8e..2d764001e 100644
--- a/libcontainer/cgroups/fs/blkio.go
+++ b/libcontainer/cgroups/fs/blkio.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/blkio_test.go b/libcontainer/cgroups/fs/blkio_test.go
index 860628c7e..eb6257c0d 100644
--- a/libcontainer/cgroups/fs/blkio_test.go
+++ b/libcontainer/cgroups/fs/blkio_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/cpu.go b/libcontainer/cgroups/fs/cpu.go
index 657570a27..cd81cabc1 100644
--- a/libcontainer/cgroups/fs/cpu.go
+++ b/libcontainer/cgroups/fs/cpu.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/cpu_test.go b/libcontainer/cgroups/fs/cpu_test.go
index 77d12af89..958e6040e 100644
--- a/libcontainer/cgroups/fs/cpu_test.go
+++ b/libcontainer/cgroups/fs/cpu_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/cpuacct.go b/libcontainer/cgroups/fs/cpuacct.go
index dab4a3db8..076704ab7 100644
--- a/libcontainer/cgroups/fs/cpuacct.go
+++ b/libcontainer/cgroups/fs/cpuacct.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/cpuacct_test.go b/libcontainer/cgroups/fs/cpuacct_test.go
index aaae0aa4e..753a0194b 100644
--- a/libcontainer/cgroups/fs/cpuacct_test.go
+++ b/libcontainer/cgroups/fs/cpuacct_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go
index 8c49a3001..d4edfaafa 100644
--- a/libcontainer/cgroups/fs/cpuset.go
+++ b/libcontainer/cgroups/fs/cpuset.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/cpuset_test.go b/libcontainer/cgroups/fs/cpuset_test.go
index 17de7bfa1..4918aaa28 100644
--- a/libcontainer/cgroups/fs/cpuset_test.go
+++ b/libcontainer/cgroups/fs/cpuset_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/devices.go b/libcontainer/cgroups/fs/devices.go
index dcf69ce13..2c8917049 100644
--- a/libcontainer/cgroups/fs/devices.go
+++ b/libcontainer/cgroups/fs/devices.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/devices_test.go b/libcontainer/cgroups/fs/devices_test.go
index a091543e4..b2d1624ce 100644
--- a/libcontainer/cgroups/fs/devices_test.go
+++ b/libcontainer/cgroups/fs/devices_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/freezer.go b/libcontainer/cgroups/fs/freezer.go
index 4baa2798a..cf1c5efb0 100644
--- a/libcontainer/cgroups/fs/freezer.go
+++ b/libcontainer/cgroups/fs/freezer.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/freezer_test.go b/libcontainer/cgroups/fs/freezer_test.go
index 4f9584979..b441bf74b 100644
--- a/libcontainer/cgroups/fs/freezer_test.go
+++ b/libcontainer/cgroups/fs/freezer_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/fs.go b/libcontainer/cgroups/fs/fs.go
index c1aa22354..1c1e3f3e6 100644
--- a/libcontainer/cgroups/fs/fs.go
+++ b/libcontainer/cgroups/fs/fs.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/fs_test.go b/libcontainer/cgroups/fs/fs_test.go
index 1d16ca5e7..b4430603f 100644
--- a/libcontainer/cgroups/fs/fs_test.go
+++ b/libcontainer/cgroups/fs/fs_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/hugetlb.go b/libcontainer/cgroups/fs/hugetlb.go
index 3c1b78cb7..8477fa6b3 100644
--- a/libcontainer/cgroups/fs/hugetlb.go
+++ b/libcontainer/cgroups/fs/hugetlb.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/hugetlb_test.go b/libcontainer/cgroups/fs/hugetlb_test.go
index 33c8b6d20..ac4ec1533 100644
--- a/libcontainer/cgroups/fs/hugetlb_test.go
+++ b/libcontainer/cgroups/fs/hugetlb_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
index 2c9f1d018..8e10c22b2 100644
--- a/libcontainer/cgroups/fs/memory.go
+++ b/libcontainer/cgroups/fs/memory.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/memory_test.go b/libcontainer/cgroups/fs/memory_test.go
index 82adafc56..7d13d2501 100644
--- a/libcontainer/cgroups/fs/memory_test.go
+++ b/libcontainer/cgroups/fs/memory_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/name.go b/libcontainer/cgroups/fs/name.go
index 94a94b5e8..ce9f4a0a5 100644
--- a/libcontainer/cgroups/fs/name.go
+++ b/libcontainer/cgroups/fs/name.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/net_cls.go b/libcontainer/cgroups/fs/net_cls.go
index f2617aa44..d13642926 100644
--- a/libcontainer/cgroups/fs/net_cls.go
+++ b/libcontainer/cgroups/fs/net_cls.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/net_cls_test.go b/libcontainer/cgroups/fs/net_cls_test.go
index 7c0ba03dc..6c36f0555 100644
--- a/libcontainer/cgroups/fs/net_cls_test.go
+++ b/libcontainer/cgroups/fs/net_cls_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/net_prio.go b/libcontainer/cgroups/fs/net_prio.go
index d0ac5e66b..cdc810bae 100644
--- a/libcontainer/cgroups/fs/net_prio.go
+++ b/libcontainer/cgroups/fs/net_prio.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/net_prio_test.go b/libcontainer/cgroups/fs/net_prio_test.go
index a1bb2ce4d..7983041a4 100644
--- a/libcontainer/cgroups/fs/net_prio_test.go
+++ b/libcontainer/cgroups/fs/net_prio_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/perf_event.go b/libcontainer/cgroups/fs/perf_event.go
index 1a306fbe3..8ffa83e09 100644
--- a/libcontainer/cgroups/fs/perf_event.go
+++ b/libcontainer/cgroups/fs/perf_event.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/pids.go b/libcontainer/cgroups/fs/pids.go
index 83aa6bfff..55bb91fa6 100644
--- a/libcontainer/cgroups/fs/pids.go
+++ b/libcontainer/cgroups/fs/pids.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/pids_test.go b/libcontainer/cgroups/fs/pids_test.go
index 50777716b..d05ec7215 100644
--- a/libcontainer/cgroups/fs/pids_test.go
+++ b/libcontainer/cgroups/fs/pids_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/stats_util_test.go b/libcontainer/cgroups/fs/stats_util_test.go
index 757e65b63..9b7d840a7 100644
--- a/libcontainer/cgroups/fs/stats_util_test.go
+++ b/libcontainer/cgroups/fs/stats_util_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git a/libcontainer/cgroups/fs/util_test.go b/libcontainer/cgroups/fs/util_test.go
index 7b7858f65..4a4013774 100644
--- a/libcontainer/cgroups/fs/util_test.go
+++ b/libcontainer/cgroups/fs/util_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
 Utility for testing cgroup operations.
 
diff --git a/libcontainer/cgroups/fs2/cpu.go b/libcontainer/cgroups/fs2/cpu.go
index 83578a340..bbbae4d58 100644
--- a/libcontainer/cgroups/fs2/cpu.go
+++ b/libcontainer/cgroups/fs2/cpu.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/cpuset.go b/libcontainer/cgroups/fs2/cpuset.go
index da29d7f2b..16c45bad8 100644
--- a/libcontainer/cgroups/fs2/cpuset.go
+++ b/libcontainer/cgroups/fs2/cpuset.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/devices.go b/libcontainer/cgroups/fs2/devices.go
index 5abddb367..0d2345607 100644
--- a/libcontainer/cgroups/fs2/devices.go
+++ b/libcontainer/cgroups/fs2/devices.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/freezer.go b/libcontainer/cgroups/fs2/freezer.go
index bdba120d5..8917a6411 100644
--- a/libcontainer/cgroups/fs2/freezer.go
+++ b/libcontainer/cgroups/fs2/freezer.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/fs2.go b/libcontainer/cgroups/fs2/fs2.go
index 84e4ba895..e6d38408c 100644
--- a/libcontainer/cgroups/fs2/fs2.go
+++ b/libcontainer/cgroups/fs2/fs2.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/hugetlb.go b/libcontainer/cgroups/fs2/hugetlb.go
index 1606f1d63..aed81a4b3 100644
--- a/libcontainer/cgroups/fs2/hugetlb.go
+++ b/libcontainer/cgroups/fs2/hugetlb.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/io.go b/libcontainer/cgroups/fs2/io.go
index 2771e1ef3..b2ff7d340 100644
--- a/libcontainer/cgroups/fs2/io.go
+++ b/libcontainer/cgroups/fs2/io.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/memory.go b/libcontainer/cgroups/fs2/memory.go
index 7ef6b133a..adbc4b230 100644
--- a/libcontainer/cgroups/fs2/memory.go
+++ b/libcontainer/cgroups/fs2/memory.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fs2/pids.go b/libcontainer/cgroups/fs2/pids.go
index f4c70179c..c8c4a3658 100644
--- a/libcontainer/cgroups/fs2/pids.go
+++ b/libcontainer/cgroups/fs2/pids.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git a/libcontainer/cgroups/fscommon/utils.go b/libcontainer/cgroups/fscommon/utils.go
index 196abf95d..f4a51c9e5 100644
--- a/libcontainer/cgroups/fscommon/utils.go
+++ b/libcontainer/cgroups/fscommon/utils.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fscommon
 
 import (
diff --git a/libcontainer/cgroups/fscommon/utils_test.go b/libcontainer/cgroups/fscommon/utils_test.go
index d429db93b..6470a47a1 100644
--- a/libcontainer/cgroups/fscommon/utils_test.go
+++ b/libcontainer/cgroups/fscommon/utils_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fscommon
 
 import (
diff --git a/libcontainer/cgroups/getallpids.go b/libcontainer/cgroups/getallpids.go
index b218744e4..09c01fb6f 100644
--- a/libcontainer/cgroups/getallpids.go
+++ b/libcontainer/cgroups/getallpids.go
@@ -1,4 +1,5 @@
-// +build linux,go1.16
+//go:build go1.16
+// +build go1.16
 
 package cgroups
 
diff --git a/libcontainer/cgroups/getallpids_go115.go b/libcontainer/cgroups/getallpids_go115.go
index 5d55a685d..2672dd722 100644
--- a/libcontainer/cgroups/getallpids_go115.go
+++ b/libcontainer/cgroups/getallpids_go115.go
@@ -1,4 +1,4 @@
-// +build linux,!go1.16
+// +build !go1.16
 
 package cgroups
 
diff --git a/libcontainer/cgroups/getallpids_test.go b/libcontainer/cgroups/getallpids_test.go
index b6100686e..e6b063237 100644
--- a/libcontainer/cgroups/getallpids_test.go
+++ b/libcontainer/cgroups/getallpids_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git a/libcontainer/cgroups/stats.go b/libcontainer/cgroups/stats.go
index aa257d9c6..40a81dd5a 100644
--- a/libcontainer/cgroups/stats.go
+++ b/libcontainer/cgroups/stats.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 type ThrottlingData struct {
diff --git a/libcontainer/cgroups/systemd/dbus.go b/libcontainer/cgroups/systemd/dbus.go
index a70a9df43..e69469b71 100644
--- a/libcontainer/cgroups/systemd/dbus.go
+++ b/libcontainer/cgroups/systemd/dbus.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (
diff --git a/libcontainer/cgroups/systemd/user.go b/libcontainer/cgroups/systemd/user.go
index 55d97c737..0f50f76ee 100644
--- a/libcontainer/cgroups/systemd/user.go
+++ b/libcontainer/cgroups/systemd/user.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (
diff --git a/libcontainer/cgroups/systemd/v1.go b/libcontainer/cgroups/systemd/v1.go
index 551b052ef..54266901a 100644
--- a/libcontainer/cgroups/systemd/v1.go
+++ b/libcontainer/cgroups/systemd/v1.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (
diff --git a/libcontainer/cgroups/systemd/v2.go b/libcontainer/cgroups/systemd/v2.go
index 43d416046..106720d84 100644
--- a/libcontainer/cgroups/systemd/v2.go
+++ b/libcontainer/cgroups/systemd/v2.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (
diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
index b31705bed..ec4e70198 100644
--- a/libcontainer/cgroups/utils.go
+++ b/libcontainer/cgroups/utils.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git a/libcontainer/cgroups/utils_test.go b/libcontainer/cgroups/utils_test.go
index 816bdc833..929cf511a 100644
--- a/libcontainer/cgroups/utils_test.go
+++ b/libcontainer/cgroups/utils_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git a/libcontainer/intelrdt/intelrdt.go b/libcontainer/intelrdt/intelrdt.go
index 0d5628b3b..dcf231b63 100644
--- a/libcontainer/intelrdt/intelrdt.go
+++ b/libcontainer/intelrdt/intelrdt.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 import (
diff --git a/libcontainer/intelrdt/intelrdt_test.go b/libcontainer/intelrdt/intelrdt_test.go
index 252578969..09ced5292 100644
--- a/libcontainer/intelrdt/intelrdt_test.go
+++ b/libcontainer/intelrdt/intelrdt_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 import (
diff --git a/libcontainer/intelrdt/mbm.go b/libcontainer/intelrdt/mbm.go
index 0fbecdeb2..13f31ac7a 100644
--- a/libcontainer/intelrdt/mbm.go
+++ b/libcontainer/intelrdt/mbm.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 // The flag to indicate if Intel RDT/MBM is enabled
diff --git a/libcontainer/intelrdt/mbm_test.go b/libcontainer/intelrdt/mbm_test.go
index 319f8de2b..4f22cbd0a 100644
--- a/libcontainer/intelrdt/mbm_test.go
+++ b/libcontainer/intelrdt/mbm_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 import (
diff --git a/libcontainer/intelrdt/stats.go b/libcontainer/intelrdt/stats.go
index 4f3bd84ea..a5eb2541e 100644
--- a/libcontainer/intelrdt/stats.go
+++ b/libcontainer/intelrdt/stats.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 type L3CacheInfo struct {
diff --git a/libcontainer/intelrdt/util_test.go b/libcontainer/intelrdt/util_test.go
index a471c5e26..a5fcc97b6 100644
--- a/libcontainer/intelrdt/util_test.go
+++ b/libcontainer/intelrdt/util_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
  * Utility for testing Intel RDT operations.
  * Creates a mock of the Intel RDT "resource control" filesystem for the duration of the test.
diff --git a/libcontainer/keys/keyctl.go b/libcontainer/keys/keyctl.go
index 412b724ee..f3a6c5343 100644
--- a/libcontainer/keys/keyctl.go
+++ b/libcontainer/keys/keyctl.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package keys
 
 import (
diff --git a/libcontainer/restored_process.go b/libcontainer/restored_process.go
index 6987c8fd5..cdffbd3af 100644
--- a/libcontainer/restored_process.go
+++ b/libcontainer/restored_process.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/utils/cmsg.go b/libcontainer/utils/cmsg.go
index c8a9364d5..52a616550 100644
--- a/libcontainer/utils/cmsg.go
+++ b/libcontainer/utils/cmsg.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package utils
 
 /*