Cleanup build constraints

Signed-off-by: Maksym Pavlenko <[email protected]>
k3s-io · Dec 8, 2022 · 3bc8fc4 · 3bc8fc4
1 parent d39ee7b
commit 3bc8fc4
Show file tree

Hide file tree

Showing 99 changed files with 0 additions and 99 deletions.
diff --git a/archive/tar_mostunix.go b/archive/tar_mostunix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !freebsd
-// +build !windows,!freebsd
 
 /*
    Copyright The containerd Authors.

diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/archive/tar_unix.go b/archive/tar_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/archive/time_unix.go b/archive/time_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cio/io_unix.go b/cio/io_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cio/io_unix_test.go b/cio/io_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd-shim-runc-v1/main.go b/cmd/containerd-shim-runc-v1/main.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd-stress/rlimit_unix.go b/cmd/containerd-stress/rlimit_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !freebsd
-// +build !windows,!freebsd
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/builtins/aufs_linux.go b/cmd/containerd/builtins/aufs_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_aufs
-// +build !no_aufs
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/builtins/btrfs_linux.go b/cmd/containerd/builtins/btrfs_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_btrfs && cgo
-// +build !no_btrfs,cgo
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || solaris
-// +build darwin freebsd solaris
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/builtins/devmapper_linux.go b/cmd/containerd/builtins/devmapper_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_devmapper
-// +build !no_devmapper
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/builtins/tracing.go b/cmd/containerd/builtins/tracing.go
@@ -1,5 +1,4 @@
 //go:build !no_tracing
-// +build !no_tracing
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/builtins/zfs_linux.go b/cmd/containerd/builtins/zfs_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_zfs
-// +build !no_zfs
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd || solaris
-// +build linux darwin freebsd solaris
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/command/notify_unsupported.go b/cmd/containerd/command/notify_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/app/main_unix.go b/cmd/ctr/app/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/commands_unix.go b/cmd/ctr/commands/commands_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/pprof/pprof_unix.go b/cmd/ctr/commands/pprof/pprof_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/shim/io_unix.go b/cmd/ctr/commands/shim/io_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/signals_notlinux.go b/cmd/ctr/commands/signals_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.

diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/container_opts_unix.go b/container_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/defaults/defaults_unix.go b/defaults/defaults_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/diff/stream_unix.go b/diff/stream_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/addition_gids_test.go b/integration/addition_gids_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/sandbox_clean_remove_test.go b/integration/sandbox_clean_remove_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/sandbox_clean_remove_windows_test.go b/integration/sandbox_clean_remove_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/volume_copy_up_unix_test.go b/integration/volume_copy_up_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/volume_copy_up_windows_test.go b/integration/volume_copy_up_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/windows_hostprocess_test.go b/integration/windows_hostprocess_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.

diff --git a/integration/windows_rootfs_size_test.go b/integration/windows_rootfs_size_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.

diff --git a/mount/lookup_unix.go b/mount/lookup_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/mount/lookup_unsupported.go b/mount/lookup_unsupported.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.

diff --git a/mount/mount_unix.go b/mount/mount_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || openbsd
-// +build darwin openbsd
 
 /*
    Copyright The containerd Authors.

diff --git a/mount/temp_unix.go b/mount/temp_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/mount/temp_unsupported.go b/mount/temp_unsupported.go
@@ -1,5 +1,4 @@
 //go:build windows || darwin
-// +build windows darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/mounts.go b/oci/mounts.go
@@ -1,5 +1,4 @@
 //go:build !freebsd
-// +build !freebsd
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/utils_unix.go b/oci/utils_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/utils_unix_go116_test.go b/oci/utils_unix_go116_test.go
@@ -1,5 +1,4 @@
 //go:build !go1.17 && !windows && !darwin
-// +build !go1.17,!windows,!darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/utils_unix_go117_test.go b/oci/utils_unix_go117_test.go
@@ -1,5 +1,4 @@
 //go:build go1.17 && !windows && !darwin
-// +build go1.17,!windows,!darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/oci/utils_unix_test.go b/oci/utils_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.

diff --git a/oss_fuzz.go b/oss_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.

diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.

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

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

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

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

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

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

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

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

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

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