libct/*: remove linux build tag from some pkgs

kolyshkin · kolyshkin · commit dbb9fc03ae59 · 2021-08-30T20:52:07.000-07:00
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&gt;/dev/null \
		&amp;&amp; GOOS=solaris go build $pkg 2&gt;/dev/null \
		&amp;&amp; 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 &lt;kolyshkin@gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package fscommon
 
 import (
diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 import (
diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-// +build linux
-
 package intelrdt
 
 import (
diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-// +build linux
-
 package keys
 
 import (
diff --git 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
@@ -1,5 +1,3 @@
-// +build linux
-
 package utils
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux`
`2`		`-`
`3`	`1`	`package cgroups`
`4`	`2`
`5`	`3`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux`
`2`		`-`
`3`	`1`	`// SPDX-License-Identifier: Apache-2.0`
`4`	`2`	`/*`
`5`	`3`	`* Copyright (C) 2020 Aleksa Sarai <cyphar@cyphar.com>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux`
`2`		`-`
`3`	`1`	`package fs`
`4`	`2`
`5`	`3`	`import (`