Merge pull request #7879 from fuweid/clean-build-tags

2022-12-30 00:22:03 -08:00
parent 5cf6040cce 6b7e237fc7
commit b0b28f1d8e
160 changed files with 0 additions and 160 deletions
--- a/pkg/apparmor/apparmor_unsupported.go
+++ b/pkg/apparmor/apparmor_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/blockio_linux.go
+++ b/pkg/cri/sbserver/blockio_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/blockio_stub_linux.go
+++ b/pkg/cri/sbserver/blockio_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_create_other.go
+++ b/pkg/cri/sbserver/container_create_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_create_other_test.go
+++ b/pkg/cri/sbserver/container_create_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_stats_list_other.go
+++ b/pkg/cri/sbserver/container_stats_list_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_update_resources.go
+++ b/pkg/cri/sbserver/container_update_resources.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !freebsd
-// +build !darwin,!freebsd

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_update_resources_other.go
+++ b/pkg/cri/sbserver/container_update_resources_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/fuzz.go
+++ b/pkg/cri/sbserver/fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/helpers_other.go
+++ b/pkg/cri/sbserver/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/podsandbox/helpers_other.go
+++ b/pkg/cri/sbserver/podsandbox/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
+++ b/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
+++ b/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/rdt_linux.go
+++ b/pkg/cri/sbserver/rdt_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_rdt
-// +build !no_rdt

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/rdt_stub_linux.go
+++ b/pkg/cri/sbserver/rdt_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build no_rdt
-// +build no_rdt

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/sandbox_portforward_other.go
+++ b/pkg/cri/sbserver/sandbox_portforward_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/sandbox_run_other.go
+++ b/pkg/cri/sbserver/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/sandbox_stats_other.go
+++ b/pkg/cri/sbserver/sandbox_stats_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/service_other.go
+++ b/pkg/cri/sbserver/service_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/bandwidth/unsupported.go
+++ b/pkg/cri/server/bandwidth/unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/nri-api.go
+++ b/pkg/cri/server/nri-api.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/nri-api_other.go
+++ b/pkg/cri/server/nri-api_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/nri-api_windows.go
+++ b/pkg/cri/server/nri-api_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 /*
   Copyright The containerd Authors.
--- a/pkg/dialer/dialer_unix.go
+++ b/pkg/dialer/dialer_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/netns/netns_other.go
+++ b/pkg/netns/netns_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/container_linux.go
+++ b/pkg/nri/container_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/container_other.go
+++ b/pkg/nri/container_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/sandbox_linux.go
+++ b/pkg/nri/sandbox_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/sandbox_other.go
+++ b/pkg/nri/sandbox_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/oom/oom.go
+++ b/pkg/oom/oom.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/oom/v1/v1.go
+++ b/pkg/oom/v1/v1.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/oom/v2/v2.go
+++ b/pkg/oom/v2/v2.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/process/deleted_state.go
+++ b/pkg/process/deleted_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/exec.go
+++ b/pkg/process/exec.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/exec_state.go
+++ b/pkg/process/exec_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/init.go
+++ b/pkg/process/init.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/init_state.go
+++ b/pkg/process/init_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/io.go
+++ b/pkg/process/io.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/io_test.go
+++ b/pkg/process/io_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/process/utils.go
+++ b/pkg/process/utils.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/seccomp/seccomp_unsupported.go
+++ b/pkg/seccomp/seccomp_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/seed/seed_other.go
+++ b/pkg/seed/seed_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/testutil/helpers_unix.go
+++ b/pkg/testutil/helpers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/testutil/mount_other.go
+++ b/pkg/testutil/mount_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows

 /*
   Copyright The containerd Authors.
--- a/pkg/userns/userns_unsupported.go
+++ b/pkg/userns/userns_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.