diff --git a/cmd/podman-mac-helper/install.go b/cmd/podman-mac-helper/install.go index 90761a28af..4aec4d95ac 100644 --- a/cmd/podman-mac-helper/install.go +++ b/cmd/podman-mac-helper/install.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package main diff --git a/cmd/podman-mac-helper/main.go b/cmd/podman-mac-helper/main.go index d3e5310929..55aaa0e7c0 100644 --- a/cmd/podman-mac-helper/main.go +++ b/cmd/podman-mac-helper/main.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package main diff --git a/cmd/podman-mac-helper/service.go b/cmd/podman-mac-helper/service.go index a2d1d4c6d0..8083d98841 100644 --- a/cmd/podman-mac-helper/service.go +++ b/cmd/podman-mac-helper/service.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package main diff --git a/cmd/podman-mac-helper/uninstall.go b/cmd/podman-mac-helper/uninstall.go index 1c77d2ea70..7700ae8855 100644 --- a/cmd/podman-mac-helper/uninstall.go +++ b/cmd/podman-mac-helper/uninstall.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package main diff --git a/cmd/podman-wslkerninst/event-hook.go b/cmd/podman-wslkerninst/event-hook.go index a5c23e4cfc..37beb2ff54 100644 --- a/cmd/podman-wslkerninst/event-hook.go +++ b/cmd/podman-wslkerninst/event-hook.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package main diff --git a/cmd/podman-wslkerninst/main.go b/cmd/podman-wslkerninst/main.go index 0f8a8624a7..35fa9b8e57 100644 --- a/cmd/podman-wslkerninst/main.go +++ b/cmd/podman-wslkerninst/main.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package main diff --git a/cmd/podman/client_supported.go b/cmd/podman/client_supported.go index 2d744e0230..c68cdc0496 100644 --- a/cmd/podman/client_supported.go +++ b/cmd/podman/client_supported.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package main diff --git a/cmd/podman/compose.go b/cmd/podman/compose.go index 5dff6150dc..2d023c5b65 100644 --- a/cmd/podman/compose.go +++ b/cmd/podman/compose.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package main diff --git a/cmd/podman/early_init_unsupported.go b/cmd/podman/early_init_unsupported.go index 2af3157b40..e58a72d25d 100644 --- a/cmd/podman/early_init_unsupported.go +++ b/cmd/podman/early_init_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin package main diff --git a/cmd/podman/images/utils_unsupported.go b/cmd/podman/images/utils_unsupported.go index 7d4a19ded6..213062cc62 100644 --- a/cmd/podman/images/utils_unsupported.go +++ b/cmd/podman/images/utils_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package images diff --git a/cmd/podman/machine/client9p.go b/cmd/podman/machine/client9p.go index a4305ca535..3f91364efd 100644 --- a/cmd/podman/machine/client9p.go +++ b/cmd/podman/machine/client9p.go @@ -1,6 +1,4 @@ //go:build linux && (amd64 || arm64) -// +build linux -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go index 110ce3e908..fbc5af3c92 100644 --- a/cmd/podman/machine/info.go +++ b/cmd/podman/machine/info.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 73867fc172..f1ad1073d9 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index 47b34fe032..1840876a3c 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index beac82edce..e0c92c4238 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go index 11bebcf260..48ea7b3b6a 100644 --- a/cmd/podman/machine/machine.go +++ b/cmd/podman/machine/machine.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/machine_unix.go b/cmd/podman/machine/machine_unix.go index a2d9b9d8e6..94004898fb 100644 --- a/cmd/podman/machine/machine_unix.go +++ b/cmd/podman/machine/machine_unix.go @@ -1,5 +1,4 @@ //go:build linux || aix || android || darwin || dragonfly || freebsd || hurd || illumos || ios || netbsd || openbsd || solaris -// +build linux aix android darwin dragonfly freebsd hurd illumos ios netbsd openbsd solaris package machine diff --git a/cmd/podman/machine/machine_unsupported.go b/cmd/podman/machine/machine_unsupported.go index e110498880..dc6514d356 100644 --- a/cmd/podman/machine/machine_unsupported.go +++ b/cmd/podman/machine/machine_unsupported.go @@ -1,5 +1,4 @@ //go:build !amd64 && !arm64 -// +build !amd64,!arm64 package machine diff --git a/cmd/podman/machine/os.go b/cmd/podman/machine/os.go index 54a9f9cbb6..0059ab6a04 100644 --- a/cmd/podman/machine/os.go +++ b/cmd/podman/machine/os.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/os/apply.go b/cmd/podman/machine/os/apply.go index 18c9aa509f..79695768c6 100644 --- a/cmd/podman/machine/os/apply.go +++ b/cmd/podman/machine/os/apply.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package os diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 608cf0da0a..8ea79d48c4 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package os diff --git a/cmd/podman/machine/os/os_unsupported.go b/cmd/podman/machine/os/os_unsupported.go index 47ca2fce6b..c9d8d185be 100644 --- a/cmd/podman/machine/os/os_unsupported.go +++ b/cmd/podman/machine/os/os_unsupported.go @@ -1,5 +1,4 @@ //go:build !amd64 && !arm64 -// +build !amd64,!arm64 package os diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go index 64d7bb17c9..ca1128e5d4 100644 --- a/cmd/podman/machine/rm.go +++ b/cmd/podman/machine/rm.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/server9p.go b/cmd/podman/machine/server9p.go index 673f34290c..6eb6354f50 100644 --- a/cmd/podman/machine/server9p.go +++ b/cmd/podman/machine/server9p.go @@ -1,6 +1,4 @@ //go:build windows && (amd64 || arm64) -// +build windows -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/set.go b/cmd/podman/machine/set.go index 0682d4f87a..f163a4fbd5 100644 --- a/cmd/podman/machine/set.go +++ b/cmd/podman/machine/set.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index c662e59cd4..dd39eff0c7 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go index 42675bd6d4..6063fce376 100644 --- a/cmd/podman/machine/start.go +++ b/cmd/podman/machine/start.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go index 1903061daf..a9b4c1b66d 100644 --- a/cmd/podman/machine/stop.go +++ b/cmd/podman/machine/stop.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/cmd/podman/parse/parse.go b/cmd/podman/parse/parse.go index 47db066d35..b018dad25f 100644 --- a/cmd/podman/parse/parse.go +++ b/cmd/podman/parse/parse.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package parse diff --git a/cmd/podman/registry/config_abi.go b/cmd/podman/registry/config_abi.go index 7babfa1696..cdac89f387 100644 --- a/cmd/podman/registry/config_abi.go +++ b/cmd/podman/registry/config_abi.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package registry diff --git a/cmd/podman/registry/config_tunnel.go b/cmd/podman/registry/config_tunnel.go index dfdbab8f85..9b80fb24c3 100644 --- a/cmd/podman/registry/config_tunnel.go +++ b/cmd/podman/registry/config_tunnel.go @@ -1,5 +1,4 @@ //go:build remote -// +build remote package registry diff --git a/cmd/podman/registry/registry_common.go b/cmd/podman/registry/registry_common.go index 2b0cdb16f9..75a92cd93f 100644 --- a/cmd/podman/registry/registry_common.go +++ b/cmd/podman/registry/registry_common.go @@ -1,5 +1,4 @@ //go:build !freebsd -// +build !freebsd package registry diff --git a/cmd/podman/syslog_common.go b/cmd/podman/syslog_common.go index e33eb8aaec..e8feaf1a8c 100644 --- a/cmd/podman/syslog_common.go +++ b/cmd/podman/syslog_common.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package main diff --git a/cmd/podman/syslog_unsupported.go b/cmd/podman/syslog_unsupported.go index 24c4f3134d..12d9b51b76 100644 --- a/cmd/podman/syslog_unsupported.go +++ b/cmd/podman/syslog_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd -// +build !linux,!freebsd package main diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index b2bca9be09..c1fa0a5307 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package system diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index e5a241a4f4..a4d3906541 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package system diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 929ef16330..89c7e2dbf3 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package system diff --git a/cmd/podman/system/reset_machine.go b/cmd/podman/system/reset_machine.go index fef5c75937..183b8e81f4 100644 --- a/cmd/podman/system/reset_machine.go +++ b/cmd/podman/system/reset_machine.go @@ -1,5 +1,4 @@ //go:build (amd64 && !remote) || (arm64 && !remote) -// +build amd64,!remote arm64,!remote package system diff --git a/cmd/podman/system/reset_machine_unsupported.go b/cmd/podman/system/reset_machine_unsupported.go index e063cd0899..76b473c3ce 100644 --- a/cmd/podman/system/reset_machine_unsupported.go +++ b/cmd/podman/system/reset_machine_unsupported.go @@ -1,5 +1,4 @@ //go:build !amd64 && !arm64 -// +build !amd64,!arm64 package system diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 6474e1aa2a..d3f3b2e0f6 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -1,6 +1,4 @@ //go:build (linux || freebsd) && !remote -// +build linux freebsd -// +build !remote package system diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index 302f4036de..69fd742f36 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -1,6 +1,4 @@ //go:build (linux || freebsd) && !remote -// +build linux freebsd -// +build !remote package system diff --git a/cmd/rootlessport/main.go b/cmd/rootlessport/main.go index 574d808cfe..9b24f04804 100644 --- a/cmd/rootlessport/main.go +++ b/cmd/rootlessport/main.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package main diff --git a/cmd/winpath/main.go b/cmd/winpath/main.go index bb57e39de9..ca10a7dff0 100644 --- a/cmd/winpath/main.go +++ b/cmd/winpath/main.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package main diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index a2740b289f..20610cfc3e 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 954a848daa..94eb5e6a20 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/common_test.go b/libpod/common_test.go index ed6577f9f0..df1bbb6de9 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container.go b/libpod/container.go index 95d3f85e51..f9803a55e8 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_api.go b/libpod/container_api.go index b0e06566df..7e3bd48832 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 5817f3a189..9ef7970613 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_config.go b/libpod/container_config.go index d252d95a83..00fac9f3ed 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index c8156a6302..e394018f27 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/container_copy_freebsd.go b/libpod/container_copy_freebsd.go index d19acc23a6..9697222d31 100644 --- a/libpod/container_copy_freebsd.go +++ b/libpod/container_copy_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go index 9096be810f..ca8be36645 100644 --- a/libpod/container_copy_linux.go +++ b/libpod/container_copy_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_exec.go b/libpod/container_exec.go index babfca09e8..8b3e8dda5e 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_freebsd.go b/libpod/container_freebsd.go index 7164eefd86..51d8e9bf3b 100644 --- a/libpod/container_freebsd.go +++ b/libpod/container_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_graph.go b/libpod/container_graph.go index 6fae1c29a0..2c35e00365 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go index 665f055275..b0cb2a94e1 100644 --- a/libpod/container_graph_test.go +++ b/libpod/container_graph_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index d823c7749d..64419329cd 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_inspect_freebsd.go b/libpod/container_inspect_freebsd.go index b0f8bae544..7e0f11b00b 100644 --- a/libpod/container_inspect_freebsd.go +++ b/libpod/container_inspect_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go index 402634284e..026cde377b 100644 --- a/libpod/container_inspect_linux.go +++ b/libpod/container_inspect_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 3fa50f5e1d..8e583de4c0 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 7fc77a09f5..75660f7cbe 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go index 430e16d3fa..b594089200 100644 --- a/libpod/container_internal_freebsd.go +++ b/libpod/container_internal_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 2d392d313b..c40a30209f 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_internal_linux_test.go b/libpod/container_internal_linux_test.go index 850ad57e6a..4deb513b8a 100644 --- a/libpod/container_internal_linux_test.go +++ b/libpod/container_internal_linux_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go index 9f6b504cdc..f66703e1da 100644 --- a/libpod/container_internal_test.go +++ b/libpod/container_internal_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_linux.go b/libpod/container_linux.go index 8ff47f461f..1101aaa8eb 100644 --- a/libpod/container_linux.go +++ b/libpod/container_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_log.go b/libpod/container_log.go index 55043456ff..1e5d69f89e 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index c3564fbf27..ebf08f61c2 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -1,5 +1,4 @@ //go:build !remote && linux && systemd -// +build !remote,linux,systemd package libpod diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go index 6f89f4612d..6a9081d50d 100644 --- a/libpod/container_log_unsupported.go +++ b/libpod/container_log_unsupported.go @@ -1,6 +1,4 @@ //go:build !remote && (!linux || !systemd) -// +build !remote -// +build !linux !systemd package libpod diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go index 4148379977..1f3938b2ec 100644 --- a/libpod/container_path_resolution.go +++ b/libpod/container_path_resolution.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_path_resolution_test.go b/libpod/container_path_resolution_test.go index 38e60ed603..0d9c660b96 100644 --- a/libpod/container_path_resolution_test.go +++ b/libpod/container_path_resolution_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go index b2e7eacd79..198290f168 100644 --- a/libpod/container_stat_common.go +++ b/libpod/container_stat_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/container_stat_freebsd.go b/libpod/container_stat_freebsd.go index 24288d7984..16464689e8 100644 --- a/libpod/container_stat_freebsd.go +++ b/libpod/container_stat_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go index ef0e88c322..210e6f98d2 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_top_freebsd.go b/libpod/container_top_freebsd.go index 801814bb60..358f9e8125 100644 --- a/libpod/container_top_freebsd.go +++ b/libpod/container_top_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/container_top_linux.c b/libpod/container_top_linux.c index 735becc640..a7192c54c2 100644 --- a/libpod/container_top_linux.c +++ b/libpod/container_top_linux.c @@ -1,5 +1,5 @@ //go:build !remote -// +build !remote + #define _GNU_SOURCE #include diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index aa81a8b459..d8591e98e2 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -1,5 +1,4 @@ //go:build !remote && linux && cgo -// +build !remote,linux,cgo package libpod diff --git a/libpod/container_top_unsupported.go b/libpod/container_top_unsupported.go index 66fd66887a..1c47b69d52 100644 --- a/libpod/container_top_unsupported.go +++ b/libpod/container_top_unsupported.go @@ -1,7 +1,4 @@ //go:build !remote && !(linux && cgo) && !freebsd -// +build !remote -// +build !linux !cgo -// +build !freebsd package libpod diff --git a/libpod/container_validate.go b/libpod/container_validate.go index e01d8ef098..26504a5bd2 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/diff.go b/libpod/diff.go index 906329d78a..66d1077f2d 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/events.go b/libpod/events.go index 8af4f19d1a..14df5e7c04 100644 --- a/libpod/events.go +++ b/libpod/events.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/events/events_unsupported.go b/libpod/events/events_unsupported.go index 01031c2250..e1be1b015d 100644 --- a/libpod/events/events_unsupported.go +++ b/libpod/events/events_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd -// +build !linux,!freebsd package events diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 72c8352202..710bbd9079 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -1,5 +1,4 @@ //go:build systemd -// +build systemd package events diff --git a/libpod/events/journal_unsupported.go b/libpod/events/journal_unsupported.go index 6ed39792bc..5cbd75acd1 100644 --- a/libpod/events/journal_unsupported.go +++ b/libpod/events/journal_unsupported.go @@ -1,5 +1,4 @@ //go:build !systemd -// +build !systemd package events diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 17c93e9609..865c2272cf 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package events diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index 2df8b670e1..d5faf06ed9 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 08a35415e4..34be42e4e5 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -1,5 +1,4 @@ //go:build !remote && systemd -// +build !remote,systemd package libpod diff --git a/libpod/healthcheck_nosystemd_linux.go b/libpod/healthcheck_nosystemd_linux.go index cde5f0c10f..cd8503f82a 100644 --- a/libpod/healthcheck_nosystemd_linux.go +++ b/libpod/healthcheck_nosystemd_linux.go @@ -1,5 +1,4 @@ //go:build !remote && !systemd -// +build !remote,!systemd package libpod diff --git a/libpod/healthcheck_unsupported.go b/libpod/healthcheck_unsupported.go index 5e2c151f42..0517465dbc 100644 --- a/libpod/healthcheck_unsupported.go +++ b/libpod/healthcheck_unsupported.go @@ -1,5 +1,4 @@ //go:build !remote && !linux -// +build !remote,!linux package libpod diff --git a/libpod/info.go b/libpod/info.go index aab56a3625..6558638fc0 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/info_freebsd.go b/libpod/info_freebsd.go index 19b4257e37..959553bf5e 100644 --- a/libpod/info_freebsd.go +++ b/libpod/info_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/info_linux.go b/libpod/info_linux.go index e01510857d..f992647d9b 100644 --- a/libpod/info_linux.go +++ b/libpod/info_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/info_test.go b/libpod/info_test.go index c8c217a3f1..bc3c0b9ddc 100644 --- a/libpod/info_test.go +++ b/libpod/info_test.go @@ -1,5 +1,4 @@ //go:build !remote && linux -// +build !remote,linux package libpod diff --git a/libpod/kube.go b/libpod/kube.go index ba445e7c17..104b9f1d5a 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/linkmode/linkmode_dynamic.go b/libpod/linkmode/linkmode_dynamic.go index f020fa53e0..81b222e5cf 100644 --- a/libpod/linkmode/linkmode_dynamic.go +++ b/libpod/linkmode/linkmode_dynamic.go @@ -1,5 +1,4 @@ //go:build !static -// +build !static package linkmode diff --git a/libpod/linkmode/linkmode_static.go b/libpod/linkmode/linkmode_static.go index b181ad285f..bc2a72200e 100644 --- a/libpod/linkmode/linkmode_static.go +++ b/libpod/linkmode/linkmode_static.go @@ -1,5 +1,4 @@ //go:build static -// +build static package linkmode diff --git a/libpod/lock/shm/shm_lock.go b/libpod/lock/shm/shm_lock.go index 239d0e47a7..24031a8cab 100644 --- a/libpod/lock/shm/shm_lock.go +++ b/libpod/lock/shm/shm_lock.go @@ -1,6 +1,4 @@ //go:build (linux || freebsd) && cgo -// +build linux freebsd -// +build cgo package shm diff --git a/libpod/lock/shm/shm_lock_nocgo.go b/libpod/lock/shm/shm_lock_nocgo.go index 7e0ccd61f0..6040079387 100644 --- a/libpod/lock/shm/shm_lock_nocgo.go +++ b/libpod/lock/shm/shm_lock_nocgo.go @@ -1,5 +1,4 @@ //go:build linux && !cgo -// +build linux,!cgo package shm diff --git a/libpod/lock/shm/shm_lock_test.go b/libpod/lock/shm/shm_lock_test.go index 3b169d5816..532d50aaef 100644 --- a/libpod/lock/shm/shm_lock_test.go +++ b/libpod/lock/shm/shm_lock_test.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package shm diff --git a/libpod/lock/shm_lock_manager_linux.go b/libpod/lock/shm_lock_manager_linux.go index 344183eb59..c6b76e0a2e 100644 --- a/libpod/lock/shm_lock_manager_linux.go +++ b/libpod/lock/shm_lock_manager_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package lock diff --git a/libpod/lock/shm_lock_manager_unsupported.go b/libpod/lock/shm_lock_manager_unsupported.go index 9ca01d57dd..88e25467df 100644 --- a/libpod/lock/shm_lock_manager_unsupported.go +++ b/libpod/lock/shm_lock_manager_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package lock diff --git a/libpod/mounts_linux.go b/libpod/mounts_linux.go index a30136f8a3..10dbdcb155 100644 --- a/libpod/mounts_linux.go +++ b/libpod/mounts_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/networking_common.go b/libpod/networking_common.go index d3a3981f69..3cf235b043 100644 --- a/libpod/networking_common.go +++ b/libpod/networking_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index a81551f6ec..ff894803bb 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 2c0172f64d..977fdf108a 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go index 9f751ab7e3..bf3bd3ca99 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/networking_machine.go b/libpod/networking_machine.go index 5fb8986a31..7804b53d64 100644 --- a/libpod/networking_machine.go +++ b/libpod/networking_machine.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/networking_pasta_linux.go b/libpod/networking_pasta_linux.go index 905810a0f7..97e8118e7c 100644 --- a/libpod/networking_pasta_linux.go +++ b/libpod/networking_pasta_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote // SPDX-License-Identifier: Apache-2.0 // diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index e8eaa76820..8cf22a5460 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -1,5 +1,4 @@ //go:build !remote && linux -// +build !remote,linux package libpod diff --git a/libpod/oci.go b/libpod/oci.go index 59264dfe7d..6a6a5954a7 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon.go b/libpod/oci_conmon.go index a31df444ae..c083246e3f 100644 --- a/libpod/oci_conmon.go +++ b/libpod/oci_conmon.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon_attach_common.go b/libpod/oci_conmon_attach_common.go index 396e079dd6..dbeb5b9c03 100644 --- a/libpod/oci_conmon_attach_common.go +++ b/libpod/oci_conmon_attach_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/oci_conmon_attach_freebsd.go b/libpod/oci_conmon_attach_freebsd.go index 38ea56662d..cd5ccf8d3b 100644 --- a/libpod/oci_conmon_attach_freebsd.go +++ b/libpod/oci_conmon_attach_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon_attach_linux.go b/libpod/oci_conmon_attach_linux.go index 242cd46722..10435ee5e0 100644 --- a/libpod/oci_conmon_attach_linux.go +++ b/libpod/oci_conmon_attach_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index 00a9a69a92..8779ca72ca 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go index ec44b21554..6ce6bf7e05 100644 --- a/libpod/oci_conmon_exec_common.go +++ b/libpod/oci_conmon_exec_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/oci_conmon_exec_freebsd.go b/libpod/oci_conmon_exec_freebsd.go index baf3ac4e44..30ee67597d 100644 --- a/libpod/oci_conmon_exec_freebsd.go +++ b/libpod/oci_conmon_exec_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 8ef0d996c3..4b6fdc209a 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon_freebsd.go b/libpod/oci_conmon_freebsd.go index 344091e74e..5f113f5cba 100644 --- a/libpod/oci_conmon_freebsd.go +++ b/libpod/oci_conmon_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index bc3a67ae55..3df11d2077 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go index eedb5c6c6c..fe0c4518e8 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/oci_util.go b/libpod/oci_util.go index 981174561d..6f57d244ae 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/options.go b/libpod/options.go index 6bc1046df9..d382854625 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod.go b/libpod/pod.go index c83dba75ae..c63f320012 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_api.go b/libpod/pod_api.go index c5bab8c2d7..8fb6d965d3 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index 7554705d24..96489865c7 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_internal_freebsd.go b/libpod/pod_internal_freebsd.go index d8c1111d91..f510ef37b0 100644 --- a/libpod/pod_internal_freebsd.go +++ b/libpod/pod_internal_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go index e8710d5b1b..c386aff8e5 100644 --- a/libpod/pod_internal_linux.go +++ b/libpod/pod_internal_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_status.go b/libpod/pod_status.go index 1b4767b25b..e11260696b 100644 --- a/libpod/pod_status.go +++ b/libpod/pod_status.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_top_freebsd.go b/libpod/pod_top_freebsd.go index 902e369a7e..cbab60a944 100644 --- a/libpod/pod_top_freebsd.go +++ b/libpod/pod_top_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go index a800494182..f139fe1798 100644 --- a/libpod/pod_top_linux.go +++ b/libpod/pod_top_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/reset.go b/libpod/reset.go index b80cbe007e..db82ae53d8 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/rlimit_int64.go b/libpod/rlimit_int64.go index 23dbc50662..ba651d078f 100644 --- a/libpod/rlimit_int64.go +++ b/libpod/rlimit_int64.go @@ -1,5 +1,4 @@ //go:build !remote && freebsd -// +build !remote,freebsd package libpod diff --git a/libpod/rlimit_uint64.go b/libpod/rlimit_uint64.go index d446b46510..585cec2147 100644 --- a/libpod/rlimit_uint64.go +++ b/libpod/rlimit_uint64.go @@ -1,5 +1,4 @@ //go:build !remote && linux -// +build !remote,linux package libpod diff --git a/libpod/runtime.go b/libpod/runtime.go index 2911c57ce2..fdc32bc773 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index 86b6d065d4..e84f72ce69 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 9b13de5af5..944191accd 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_ctr_freebsd.go b/libpod/runtime_ctr_freebsd.go index 0f6f1b0256..0f6b939389 100644 --- a/libpod/runtime_ctr_freebsd.go +++ b/libpod/runtime_ctr_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_ctr_linux.go b/libpod/runtime_ctr_linux.go index 09082febad..d29b73516f 100644 --- a/libpod/runtime_ctr_linux.go +++ b/libpod/runtime_ctr_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index c07e8cbaa7..b51ea95b50 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_migrate_linux.go b/libpod/runtime_migrate_linux.go index 717b123baa..07ed237165 100644 --- a/libpod/runtime_migrate_linux.go +++ b/libpod/runtime_migrate_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_migrate_unsupported.go b/libpod/runtime_migrate_unsupported.go index 0a1b0b9fdc..039843428e 100644 --- a/libpod/runtime_migrate_unsupported.go +++ b/libpod/runtime_migrate_unsupported.go @@ -1,5 +1,4 @@ //go:build !remote && !linux -// +build !remote,!linux package libpod diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index 3fe88268de..2b335fecce 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_pod_common.go b/libpod/runtime_pod_common.go index 2aa9ea3203..f939756055 100644 --- a/libpod/runtime_pod_common.go +++ b/libpod/runtime_pod_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/runtime_pod_freebsd.go b/libpod/runtime_pod_freebsd.go index 67d02385e1..b78b9ec16a 100644 --- a/libpod/runtime_pod_freebsd.go +++ b/libpod/runtime_pod_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 5c9e6ec651..28f72daf04 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_pre_go1.20.go b/libpod/runtime_pre_go1.20.go index 3dcbe1808a..94195f35cc 100644 --- a/libpod/runtime_pre_go1.20.go +++ b/libpod/runtime_pre_go1.20.go @@ -1,7 +1,6 @@ // In go 1.20 and later, the global RNG is automatically initialized. // Ref: https://pkg.go.dev/math/rand@go1.20#Seed //go:build !go1.20 && !remote -// +build !go1.20,!remote package libpod diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go index d4eaddaf25..43ad1f2e6a 100644 --- a/libpod/runtime_renumber.go +++ b/libpod/runtime_renumber.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_test.go b/libpod/runtime_test.go index 3e21f10484..0ed053a521 100644 --- a/libpod/runtime_test.go +++ b/libpod/runtime_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go index 292432b7bb..8724156c2f 100644 --- a/libpod/runtime_volume.go +++ b/libpod/runtime_volume.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/runtime_volume_common.go b/libpod/runtime_volume_common.go index a254b599d5..c1d52b8db3 100644 --- a/libpod/runtime_volume_common.go +++ b/libpod/runtime_volume_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/runtime_worker.go b/libpod/runtime_worker.go index 0851d74a91..20e1f4e7d1 100644 --- a/libpod/runtime_worker.go +++ b/libpod/runtime_worker.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/service.go b/libpod/service.go index fdc5f048e8..514afbe708 100644 --- a/libpod/service.go +++ b/libpod/service.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go index 4cbccd75f9..e3d8b9dad6 100644 --- a/libpod/sqlite_state.go +++ b/libpod/sqlite_state.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go index 1f2c88dee7..4487cea774 100644 --- a/libpod/sqlite_state_internal.go +++ b/libpod/sqlite_state_internal.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/state.go b/libpod/state.go index b84ee06d53..ae9290bc5a 100644 --- a/libpod/state.go +++ b/libpod/state.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/state_test.go b/libpod/state_test.go index b0558a4782..d6ce225264 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/stats_common.go b/libpod/stats_common.go index 280aa0606d..338f67a4ea 100644 --- a/libpod/stats_common.go +++ b/libpod/stats_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go index 22141906c0..3945e977ee 100644 --- a/libpod/stats_freebsd.go +++ b/libpod/stats_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go index 1254e4867d..ad8dfc45f4 100644 --- a/libpod/stats_linux.go +++ b/libpod/stats_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/storage.go b/libpod/storage.go index 3f667c3199..9ec1067e1e 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/util.go b/libpod/util.go index 106925b258..596d3a485f 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/util_freebsd.go b/libpod/util_freebsd.go index 20914b5316..c732a93ecf 100644 --- a/libpod/util_freebsd.go +++ b/libpod/util_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/util_linux.go b/libpod/util_linux.go index 0c11fba018..f550debc79 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/util_linux_test.go b/libpod/util_linux_test.go index b8766983ef..1094cd74ce 100644 --- a/libpod/util_linux_test.go +++ b/libpod/util_linux_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/util_test.go b/libpod/util_test.go index 75ff1d5c8e..42a7740f88 100644 --- a/libpod/util_test.go +++ b/libpod/util_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/volume.go b/libpod/volume.go index 0d8a179632..462c728742 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index 9916349140..7fc7bc5714 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go index 7b86c22924..3067a19f79 100644 --- a/libpod/volume_internal.go +++ b/libpod/volume_internal.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/volume_internal_common.go b/libpod/volume_internal_common.go index 06c9dd53a1..117fbe40ef 100644 --- a/libpod/volume_internal_common.go +++ b/libpod/volume_internal_common.go @@ -1,6 +1,4 @@ //go:build !remote && (linux || freebsd) -// +build !remote -// +build linux freebsd package libpod diff --git a/libpod/volume_internal_freebsd.go b/libpod/volume_internal_freebsd.go index d0d9df77ed..7e16429ea8 100644 --- a/libpod/volume_internal_freebsd.go +++ b/libpod/volume_internal_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go index e21fd97a38..4c84e27fd3 100644 --- a/libpod/volume_internal_linux.go +++ b/libpod/volume_internal_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package libpod diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index b979b92e1a..7ea86a780c 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package autoupdate diff --git a/pkg/bindings/containers/term_unix.go b/pkg/bindings/containers/term_unix.go index e14f508138..60c25e2959 100644 --- a/pkg/bindings/containers/term_unix.go +++ b/pkg/bindings/containers/term_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package containers diff --git a/pkg/bindings/generator/generator.go b/pkg/bindings/generator/generator.go index 78244b502d..8eb394fb3e 100644 --- a/pkg/bindings/generator/generator.go +++ b/pkg/bindings/generator/generator.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/pkg/bindings/images/build_unix.go b/pkg/bindings/images/build_unix.go index 07bb8cbcdc..fbdfa5df2f 100644 --- a/pkg/bindings/images/build_unix.go +++ b/pkg/bindings/images/build_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package images diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index b44cbbbbcc..8e8224d7ed 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package checkpoint diff --git a/pkg/criu/criu_linux.go b/pkg/criu/criu_linux.go index f2b877aa9b..75fd962658 100644 --- a/pkg/criu/criu_linux.go +++ b/pkg/criu/criu_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package criu diff --git a/pkg/criu/criu_unsupported.go b/pkg/criu/criu_unsupported.go index 8def2b89cf..a80a82b90b 100644 --- a/pkg/criu/criu_unsupported.go +++ b/pkg/criu/criu_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package criu diff --git a/pkg/ctime/ctime_linux.go b/pkg/ctime/ctime_linux.go index bf3cd5752e..226aeba77e 100644 --- a/pkg/ctime/ctime_linux.go +++ b/pkg/ctime/ctime_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package ctime diff --git a/pkg/ctime/ctime_unsupported.go b/pkg/ctime/ctime_unsupported.go index afee56027a..2b93c5eb1b 100644 --- a/pkg/ctime/ctime_unsupported.go +++ b/pkg/ctime/ctime_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package ctime diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go index c252473376..2fd97b717d 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package filters diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index bf41b74acf..77de6cb430 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package filters diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index cff7aa9792..3d629548d4 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package filters diff --git a/pkg/domain/infra/abi/farm.go b/pkg/domain/infra/abi/farm.go index c7e103bbea..20bdc1be12 100644 --- a/pkg/domain/infra/abi/farm.go +++ b/pkg/domain/infra/abi/farm.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package abi diff --git a/pkg/domain/infra/abi/terminal/sigproxy_commn.go b/pkg/domain/infra/abi/terminal/sigproxy_commn.go index d42685508b..8809d94bc2 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_commn.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_commn.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package terminal diff --git a/pkg/domain/infra/abi/terminal/terminal_common.go b/pkg/domain/infra/abi/terminal/terminal_common.go index f9a012b7d2..4f6fb0b066 100644 --- a/pkg/domain/infra/abi/terminal/terminal_common.go +++ b/pkg/domain/infra/abi/terminal/terminal_common.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package terminal diff --git a/pkg/domain/infra/abi/terminal/terminal_unsupported.go b/pkg/domain/infra/abi/terminal/terminal_unsupported.go index 21ed6c8d4d..48adfef6d8 100644 --- a/pkg/domain/infra/abi/terminal/terminal_unsupported.go +++ b/pkg/domain/infra/abi/terminal/terminal_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd -// +build !linux,!freebsd package terminal diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go index 7f9b177d7f..bc967c2f50 100644 --- a/pkg/domain/infra/runtime_abi.go +++ b/pkg/domain/infra/runtime_abi.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package infra diff --git a/pkg/domain/infra/runtime_abi_unsupported.go b/pkg/domain/infra/runtime_abi_unsupported.go index 9e5bd01eb2..099e82d209 100644 --- a/pkg/domain/infra/runtime_abi_unsupported.go +++ b/pkg/domain/infra/runtime_abi_unsupported.go @@ -1,5 +1,4 @@ //go:build remote -// +build remote package infra diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 098efea6f6..6b90bebb93 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package infra diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index e5761d4abf..e005bb0a93 100644 --- a/pkg/domain/infra/runtime_proxy.go +++ b/pkg/domain/infra/runtime_proxy.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package infra diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go index c3eb660eb3..83c951abb8 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -1,5 +1,4 @@ //go:build remote -// +build remote package infra diff --git a/pkg/emulation/binfmtmisc_linux.go b/pkg/emulation/binfmtmisc_linux.go index 8159f20fd5..4ab9c4d000 100644 --- a/pkg/emulation/binfmtmisc_linux.go +++ b/pkg/emulation/binfmtmisc_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package emulation diff --git a/pkg/emulation/binfmtmisc_linux_test.go b/pkg/emulation/binfmtmisc_linux_test.go index a45e480970..8ef58f07fa 100644 --- a/pkg/emulation/binfmtmisc_linux_test.go +++ b/pkg/emulation/binfmtmisc_linux_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package emulation diff --git a/pkg/emulation/binfmtmisc_other.go b/pkg/emulation/binfmtmisc_other.go index 9e7c6a48fa..cc8e686ed2 100644 --- a/pkg/emulation/binfmtmisc_other.go +++ b/pkg/emulation/binfmtmisc_other.go @@ -1,5 +1,4 @@ //go:build !linux && !remote -// +build !linux,!remote package emulation diff --git a/pkg/emulation/elf.go b/pkg/emulation/elf.go index 93f8384ed4..b686769ecc 100644 --- a/pkg/emulation/elf.go +++ b/pkg/emulation/elf.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package emulation diff --git a/pkg/emulation/emulation.go b/pkg/emulation/emulation.go index 52f9c8f48a..49b32c1f5c 100644 --- a/pkg/emulation/emulation.go +++ b/pkg/emulation/emulation.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package emulation diff --git a/pkg/env/env_unix.go b/pkg/env/env_unix.go index 690078f33c..5e779cd5f2 100644 --- a/pkg/env/env_unix.go +++ b/pkg/env/env_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package env diff --git a/pkg/fileserver/server_unsupported.go b/pkg/fileserver/server_unsupported.go index 0f8edf8c51..861f3898bb 100644 --- a/pkg/fileserver/server_unsupported.go +++ b/pkg/fileserver/server_unsupported.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package fileserver diff --git a/pkg/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go b/pkg/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go index a502b5adb6..6690a1e6f0 100644 --- a/pkg/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go +++ b/pkg/k8s.io/apimachinery/pkg/util/intstr/instr_fuzz.go @@ -1,5 +1,4 @@ //go:build !notest -// +build !notest /* Copyright 2020 The Kubernetes Authors. diff --git a/pkg/machine/applehv/claim.go b/pkg/machine/applehv/claim.go index e78f1ed319..c02f15d839 100644 --- a/pkg/machine/applehv/claim.go +++ b/pkg/machine/applehv/claim.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package applehv diff --git a/pkg/machine/applehv/config.go b/pkg/machine/applehv/config.go index 250c27fcc5..20518cd2c5 100644 --- a/pkg/machine/applehv/config.go +++ b/pkg/machine/applehv/config.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package applehv diff --git a/pkg/machine/applehv/ignition.go b/pkg/machine/applehv/ignition.go index 68e23d1596..678468e62e 100644 --- a/pkg/machine/applehv/ignition.go +++ b/pkg/machine/applehv/ignition.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package applehv diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go index c3f8d812fc..a2285330f0 100644 --- a/pkg/machine/applehv/machine.go +++ b/pkg/machine/applehv/machine.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package applehv diff --git a/pkg/machine/applehv/vfkit.go b/pkg/machine/applehv/vfkit.go index ff8c2874c1..7014d3555b 100644 --- a/pkg/machine/applehv/vfkit.go +++ b/pkg/machine/applehv/vfkit.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package applehv diff --git a/pkg/machine/applehv/vfkit/config.go b/pkg/machine/applehv/vfkit/config.go index b3fa72accc..80be55c864 100644 --- a/pkg/machine/applehv/vfkit/config.go +++ b/pkg/machine/applehv/vfkit/config.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package vfkit diff --git a/pkg/machine/applehv/vfkit/rest.go b/pkg/machine/applehv/vfkit/rest.go index b365310a2c..6729923c5f 100644 --- a/pkg/machine/applehv/vfkit/rest.go +++ b/pkg/machine/applehv/vfkit/rest.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package vfkit diff --git a/pkg/machine/config.go b/pkg/machine/config.go index 12383aa688..5d8b7402c7 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/config_test.go b/pkg/machine/config_test.go index ca08660b90..b374695d76 100644 --- a/pkg/machine/config_test.go +++ b/pkg/machine/config_test.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/connection.go b/pkg/machine/connection.go index ebecda83e3..27f8d95548 100644 --- a/pkg/machine/connection.go +++ b/pkg/machine/connection.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/define/vmfile_test.go b/pkg/machine/define/vmfile_test.go index 2f4f5948fe..8eeca3190b 100644 --- a/pkg/machine/define/vmfile_test.go +++ b/pkg/machine/define/vmfile_test.go @@ -1,5 +1,4 @@ //go:build (amd64 && !windows) || (arm64 && !windows) -// +build amd64,!windows arm64,!windows package define diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go index 6f46379f0b..07d1a7fbbd 100644 --- a/pkg/machine/fcos.go +++ b/pkg/machine/fcos.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/fcos_test.go b/pkg/machine/fcos_test.go index efb3d017ac..2d5a937310 100644 --- a/pkg/machine/fcos_test.go +++ b/pkg/machine/fcos_test.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/fedora_unix.go b/pkg/machine/fedora_unix.go index fded150094..1d6737f998 100644 --- a/pkg/machine/fedora_unix.go +++ b/pkg/machine/fedora_unix.go @@ -1,5 +1,4 @@ //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd -// +build darwin dragonfly freebsd linux netbsd openbsd package machine diff --git a/pkg/machine/hyperv/config.go b/pkg/machine/hyperv/config.go index c15ea6a1e4..fbc3abd7ab 100644 --- a/pkg/machine/hyperv/config.go +++ b/pkg/machine/hyperv/config.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hyperv diff --git a/pkg/machine/hyperv/machine.go b/pkg/machine/hyperv/machine.go index 0dc40fce2d..aa8983bcc4 100644 --- a/pkg/machine/hyperv/machine.go +++ b/pkg/machine/hyperv/machine.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hyperv diff --git a/pkg/machine/hyperv/vsock/vsock.go b/pkg/machine/hyperv/vsock/vsock.go index f4789201bb..3bcdf66c8e 100644 --- a/pkg/machine/hyperv/vsock/vsock.go +++ b/pkg/machine/hyperv/vsock/vsock.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package vsock diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go index dc6ef05230..e52554a0d9 100644 --- a/pkg/machine/ignition.go +++ b/pkg/machine/ignition.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/ignition_darwin.go b/pkg/machine/ignition_darwin.go index b9fbf218dd..bf539f7fd7 100644 --- a/pkg/machine/ignition_darwin.go +++ b/pkg/machine/ignition_darwin.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package machine diff --git a/pkg/machine/ignition_freebsd.go b/pkg/machine/ignition_freebsd.go index ddea407825..b574bf2496 100644 --- a/pkg/machine/ignition_freebsd.go +++ b/pkg/machine/ignition_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package machine diff --git a/pkg/machine/ignition_schema.go b/pkg/machine/ignition_schema.go index d6b86229cc..f583fa34bc 100644 --- a/pkg/machine/ignition_schema.go +++ b/pkg/machine/ignition_schema.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/ignition_windows.go b/pkg/machine/ignition_windows.go index 0fcc062739..c0ae1a2c9b 100644 --- a/pkg/machine/ignition_windows.go +++ b/pkg/machine/ignition_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package machine diff --git a/pkg/machine/keys.go b/pkg/machine/keys.go index 91c17aa2c6..d46f759f71 100644 --- a/pkg/machine/keys.go +++ b/pkg/machine/keys.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go index 4e43dd54ca..85c1aff3be 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/machine_unix.go b/pkg/machine/machine_unix.go index 335da02494..66c92ed4e8 100644 --- a/pkg/machine/machine_unix.go +++ b/pkg/machine/machine_unix.go @@ -1,5 +1,4 @@ //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd -// +build darwin dragonfly freebsd linux netbsd openbsd package machine diff --git a/pkg/machine/machine_unsupported.go b/pkg/machine/machine_unsupported.go index a12140e16c..056894835d 100644 --- a/pkg/machine/machine_unsupported.go +++ b/pkg/machine/machine_unsupported.go @@ -1,4 +1,3 @@ //go:build !amd64 && !arm64 -// +build !amd64,!arm64 package machine diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index fe1d2fa5c3..993aeefd41 100644 --- a/pkg/machine/machine_windows.go +++ b/pkg/machine/machine_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package machine diff --git a/pkg/machine/os/config.go b/pkg/machine/os/config.go index b7158d0323..a3630fcc45 100644 --- a/pkg/machine/os/config.go +++ b/pkg/machine/os/config.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package os diff --git a/pkg/machine/os/machine_os.go b/pkg/machine/os/machine_os.go index d8cd93519d..5081034af9 100644 --- a/pkg/machine/os/machine_os.go +++ b/pkg/machine/os/machine_os.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package os diff --git a/pkg/machine/os/ostree.go b/pkg/machine/os/ostree.go index 0eaf446ba0..5998c2d3e0 100644 --- a/pkg/machine/os/ostree.go +++ b/pkg/machine/os/ostree.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package os diff --git a/pkg/machine/ports_unix.go b/pkg/machine/ports_unix.go index e1960c3df4..38cad8948a 100644 --- a/pkg/machine/ports_unix.go +++ b/pkg/machine/ports_unix.go @@ -1,5 +1,4 @@ //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd -// +build darwin dragonfly freebsd linux netbsd openbsd package machine diff --git a/pkg/machine/pull.go b/pkg/machine/pull.go index 538d67f99c..cd587ae6da 100644 --- a/pkg/machine/pull.go +++ b/pkg/machine/pull.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/qemu/claim_unsupported.go b/pkg/machine/qemu/claim_unsupported.go index 187ef9d69e..779a86f9a7 100644 --- a/pkg/machine/qemu/claim_unsupported.go +++ b/pkg/machine/qemu/claim_unsupported.go @@ -1,5 +1,4 @@ //go:build !darwin -// +build !darwin package qemu diff --git a/pkg/machine/qemu/command/qemu_command_test.go b/pkg/machine/qemu/command/qemu_command_test.go index ed198f2a0f..5cfa6c0d5b 100644 --- a/pkg/machine/qemu/command/qemu_command_test.go +++ b/pkg/machine/qemu/command/qemu_command_test.go @@ -1,5 +1,4 @@ //go:build (amd64 && !windows) || (arm64 && !windows) -// +build amd64,!windows arm64,!windows package command diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index eba16f8e96..af4ff4568b 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package qemu diff --git a/pkg/machine/qemu/machine_test.go b/pkg/machine/qemu/machine_test.go index 354ea5b688..dbf6b9aae9 100644 --- a/pkg/machine/qemu/machine_test.go +++ b/pkg/machine/qemu/machine_test.go @@ -1,5 +1,4 @@ //go:build (amd64 && !windows) || (arm64 && !windows) -// +build amd64,!windows arm64,!windows package qemu diff --git a/pkg/machine/qemu/machine_unix.go b/pkg/machine/qemu/machine_unix.go index e764013d8c..37ed1f6193 100644 --- a/pkg/machine/qemu/machine_unix.go +++ b/pkg/machine/qemu/machine_unix.go @@ -1,5 +1,4 @@ //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd -// +build darwin dragonfly freebsd linux netbsd openbsd package qemu diff --git a/pkg/machine/qemu/machine_unsupported.go b/pkg/machine/qemu/machine_unsupported.go index b00a4f4b90..28c4df62c4 100644 --- a/pkg/machine/qemu/machine_unsupported.go +++ b/pkg/machine/qemu/machine_unsupported.go @@ -1,4 +1,3 @@ //go:build !amd64 && !arm64 -// +build !amd64,!arm64 package qemu diff --git a/pkg/machine/update.go b/pkg/machine/update.go index 9f34f3ab13..11c873ef2d 100644 --- a/pkg/machine/update.go +++ b/pkg/machine/update.go @@ -1,5 +1,4 @@ //go:build amd64 || arm64 -// +build amd64 arm64 package machine diff --git a/pkg/machine/wsl/config.go b/pkg/machine/wsl/config.go index 0ee2e77673..34fa3e7133 100644 --- a/pkg/machine/wsl/config.go +++ b/pkg/machine/wsl/config.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wsl diff --git a/pkg/machine/wsl/fedora.go b/pkg/machine/wsl/fedora.go index 43b4f50ef8..81cea04581 100644 --- a/pkg/machine/wsl/fedora.go +++ b/pkg/machine/wsl/fedora.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wsl diff --git a/pkg/machine/wsl/filelock.go b/pkg/machine/wsl/filelock.go index dadc806629..2a768bee5d 100644 --- a/pkg/machine/wsl/filelock.go +++ b/pkg/machine/wsl/filelock.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wsl diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index 10bf00e794..2aaf0cc32c 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wsl diff --git a/pkg/machine/wsl/machine_unsupported.go b/pkg/machine/wsl/machine_unsupported.go index 856f9dd0c8..971bae261b 100644 --- a/pkg/machine/wsl/machine_unsupported.go +++ b/pkg/machine/wsl/machine_unsupported.go @@ -1,4 +1,3 @@ //go:build !windows -// +build !windows package wsl diff --git a/pkg/machine/wsl/usermodenet.go b/pkg/machine/wsl/usermodenet.go index 5fb6aa32bc..e88da990c7 100644 --- a/pkg/machine/wsl/usermodenet.go +++ b/pkg/machine/wsl/usermodenet.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wsl diff --git a/pkg/machine/wsl/util_windows.go b/pkg/machine/wsl/util_windows.go index fac85f9b90..75a943cff4 100644 --- a/pkg/machine/wsl/util_windows.go +++ b/pkg/machine/wsl/util_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wsl diff --git a/pkg/machine/wsl/wutil/wutil.go b/pkg/machine/wsl/wutil/wutil.go index b994d25026..a8c67dcb98 100644 --- a/pkg/machine/wsl/wutil/wutil.go +++ b/pkg/machine/wsl/wutil/wutil.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wutil diff --git a/pkg/parallel/ctr/ctr.go b/pkg/parallel/ctr/ctr.go index 8e73aa5adc..8c3724627c 100644 --- a/pkg/parallel/ctr/ctr.go +++ b/pkg/parallel/ctr/ctr.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package ctr diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index ac51c7cf90..591f03f94c 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package ps diff --git a/pkg/rctl/rctl.go b/pkg/rctl/rctl.go index dccf9e7cd5..54ccf40b1b 100644 --- a/pkg/rctl/rctl.go +++ b/pkg/rctl/rctl.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package rctl diff --git a/pkg/rootless/rootless_freebsd.go b/pkg/rootless/rootless_freebsd.go index 525f789db4..2a459398b3 100644 --- a/pkg/rootless/rootless_freebsd.go +++ b/pkg/rootless/rootless_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd && cgo -// +build freebsd,cgo package rootless diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index d303c8bd0e..32b47c8ba3 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -1,5 +1,4 @@ //go:build linux && cgo -// +build linux,cgo package rootless diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go index c2e86fa1d8..587fb4cb96 100644 --- a/pkg/rootless/rootless_unsupported.go +++ b/pkg/rootless/rootless_unsupported.go @@ -1,5 +1,4 @@ //go:build !(linux || freebsd) || !cgo -// +build !linux,!freebsd !cgo package rootless diff --git a/pkg/signal/signal_linux.go b/pkg/signal/signal_linux.go index 81e4ed758a..5b07ccdd59 100644 --- a/pkg/signal/signal_linux.go +++ b/pkg/signal/signal_linux.go @@ -1,5 +1,4 @@ //go:build linux && !mips && !mipsle && !mips64 && !mips64le -// +build linux,!mips,!mipsle,!mips64,!mips64le // Signal handling for Linux only. package signal diff --git a/pkg/signal/signal_linux_mipsx.go b/pkg/signal/signal_linux_mipsx.go index c97eeb23da..f587c09a36 100644 --- a/pkg/signal/signal_linux_mipsx.go +++ b/pkg/signal/signal_linux_mipsx.go @@ -1,6 +1,4 @@ //go:build linux && (mips || mipsle || mips64 || mips64le) -// +build linux -// +build mips mipsle mips64 mips64le // Special signal handling for mips architecture package signal diff --git a/pkg/signal/signal_unix.go b/pkg/signal/signal_unix.go index 01d99d7bc1..6e1ed540ea 100644 --- a/pkg/signal/signal_unix.go +++ b/pkg/signal/signal_unix.go @@ -1,5 +1,4 @@ //go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris || zos -// +build aix darwin dragonfly freebsd netbsd openbsd solaris zos // Signal handling for Linux only. package signal diff --git a/pkg/signal/signal_unsupported.go b/pkg/signal/signal_unsupported.go index 590aaf978f..96c0c8f990 100644 --- a/pkg/signal/signal_unsupported.go +++ b/pkg/signal/signal_unsupported.go @@ -1,5 +1,4 @@ //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos -// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos // Signal handling for Linux only. package signal diff --git a/pkg/specgen/generate/config_common.go b/pkg/specgen/generate/config_common.go index 66c84b73cf..46953a77d4 100644 --- a/pkg/specgen/generate/config_common.go +++ b/pkg/specgen/generate/config_common.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/config_common_test.go b/pkg/specgen/generate/config_common_test.go index 08dd348b6e..e585826e2b 100644 --- a/pkg/specgen/generate/config_common_test.go +++ b/pkg/specgen/generate/config_common_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/config_freebsd.go b/pkg/specgen/generate/config_freebsd.go index edae1209b4..ec5c8622dd 100644 --- a/pkg/specgen/generate/config_freebsd.go +++ b/pkg/specgen/generate/config_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 04a5caf895..30714b5727 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/config_linux_seccomp.go b/pkg/specgen/generate/config_linux_seccomp.go index 1b41805ae0..a54794cf04 100644 --- a/pkg/specgen/generate/config_linux_seccomp.go +++ b/pkg/specgen/generate/config_linux_seccomp.go @@ -1,5 +1,4 @@ //go:build linux && !remote -// +build linux,!remote package generate diff --git a/pkg/specgen/generate/config_linux_test.go b/pkg/specgen/generate/config_linux_test.go index 6df47435d9..2643570545 100644 --- a/pkg/specgen/generate/config_linux_test.go +++ b/pkg/specgen/generate/config_linux_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 002dd433fb..4471942f24 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 5a36878425..c0878d5000 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index b7266ef978..bae88407f3 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package kube diff --git a/pkg/specgen/generate/kube/kube_test.go b/pkg/specgen/generate/kube/kube_test.go index 9e400c87b2..b579ff3263 100644 --- a/pkg/specgen/generate/kube/kube_test.go +++ b/pkg/specgen/generate/kube/kube_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package kube diff --git a/pkg/specgen/generate/kube/play_test.go b/pkg/specgen/generate/kube/play_test.go index b3d5fc966c..603462ca11 100644 --- a/pkg/specgen/generate/kube/play_test.go +++ b/pkg/specgen/generate/kube/play_test.go @@ -1,5 +1,4 @@ //go:build linux && !remote -// +build linux,!remote package kube diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go index f2eb837572..0ac8bb894b 100644 --- a/pkg/specgen/generate/kube/seccomp.go +++ b/pkg/specgen/generate/kube/seccomp.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package kube diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go index 326a691363..48f9abe094 100644 --- a/pkg/specgen/generate/kube/volume.go +++ b/pkg/specgen/generate/kube/volume.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package kube diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index c151738d1c..bc93091d17 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/namespaces_freebsd.go b/pkg/specgen/generate/namespaces_freebsd.go index 40ac22964d..d6596d3ae8 100644 --- a/pkg/specgen/generate/namespaces_freebsd.go +++ b/pkg/specgen/generate/namespaces_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/namespaces_linux.go b/pkg/specgen/generate/namespaces_linux.go index 265937e0ba..7c8aed85d6 100644 --- a/pkg/specgen/generate/namespaces_linux.go +++ b/pkg/specgen/generate/namespaces_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index c5f643308b..59cd99e70a 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/oci_freebsd.go b/pkg/specgen/generate/oci_freebsd.go index bccb461934..feede3ed8a 100644 --- a/pkg/specgen/generate/oci_freebsd.go +++ b/pkg/specgen/generate/oci_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/oci_linux.go b/pkg/specgen/generate/oci_linux.go index 7ea22e9f71..8c926f1b69 100644 --- a/pkg/specgen/generate/oci_linux.go +++ b/pkg/specgen/generate/oci_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/pause_image.go b/pkg/specgen/generate/pause_image.go index 9e131625b0..7a367e2c1c 100644 --- a/pkg/specgen/generate/pause_image.go +++ b/pkg/specgen/generate/pause_image.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index f09bcb385b..3d72574e5d 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/pod_create_test.go b/pkg/specgen/generate/pod_create_test.go index 392b7fe2a0..87c00030a4 100644 --- a/pkg/specgen/generate/pod_create_test.go +++ b/pkg/specgen/generate/pod_create_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go index ddf7707f0c..1d0d9c2059 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/ports_bench_test.go b/pkg/specgen/generate/ports_bench_test.go index fbbe927f96..4a236de0eb 100644 --- a/pkg/specgen/generate/ports_bench_test.go +++ b/pkg/specgen/generate/ports_bench_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/ports_test.go b/pkg/specgen/generate/ports_test.go index 964b91ea2f..cbee852f29 100644 --- a/pkg/specgen/generate/ports_test.go +++ b/pkg/specgen/generate/ports_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/security_freebsd.go b/pkg/specgen/generate/security_freebsd.go index 746fb3d2c3..2df1c759e2 100644 --- a/pkg/specgen/generate/security_freebsd.go +++ b/pkg/specgen/generate/security_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/security_linux.go b/pkg/specgen/generate/security_linux.go index e266fa509d..92a2362870 100644 --- a/pkg/specgen/generate/security_linux.go +++ b/pkg/specgen/generate/security_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index 4a7c776364..fa66359069 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/storage_freebsd.go b/pkg/specgen/generate/storage_freebsd.go index e2d211a2a5..9c496e3eb5 100644 --- a/pkg/specgen/generate/storage_freebsd.go +++ b/pkg/specgen/generate/storage_freebsd.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/storage_linux.go b/pkg/specgen/generate/storage_linux.go index 86f6d51bb7..8336dd59b7 100644 --- a/pkg/specgen/generate/storage_linux.go +++ b/pkg/specgen/generate/storage_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/generate/validate_linux.go b/pkg/specgen/generate/validate_linux.go index ad64dd210f..9f4c32bc9d 100644 --- a/pkg/specgen/generate/validate_linux.go +++ b/pkg/specgen/generate/validate_linux.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/specgen/specgen_local.go b/pkg/specgen/specgen_local.go index 9e84249c43..3ed3ec0435 100644 --- a/pkg/specgen/specgen_local.go +++ b/pkg/specgen/specgen_local.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package specgen diff --git a/pkg/specgen/specgen_remote.go b/pkg/specgen/specgen_remote.go index 806aed73b1..7bb83da292 100644 --- a/pkg/specgen/specgen_remote.go +++ b/pkg/specgen/specgen_remote.go @@ -1,5 +1,4 @@ //go:build remote -// +build remote package specgen diff --git a/pkg/specgen/utils.go b/pkg/specgen/utils.go index dc9127bb31..dc53d023b2 100644 --- a/pkg/specgen/utils.go +++ b/pkg/specgen/utils.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package specgen diff --git a/pkg/specgen/utils_linux.go b/pkg/specgen/utils_linux.go index d8e4cbae37..075f81c4f9 100644 --- a/pkg/specgen/utils_linux.go +++ b/pkg/specgen/utils_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package specgen diff --git a/pkg/specgen/winpath_unsupported.go b/pkg/specgen/winpath_unsupported.go index 4cd008fddc..ff40b55a49 100644 --- a/pkg/specgen/winpath_unsupported.go +++ b/pkg/specgen/winpath_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !windows -// +build !linux,!windows package specgen diff --git a/pkg/specgenutil/specgenutil_test.go b/pkg/specgenutil/specgenutil_test.go index 6abe5ff777..6a7a68939e 100644 --- a/pkg/specgenutil/specgenutil_test.go +++ b/pkg/specgenutil/specgenutil_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package specgenutil diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index 1ec0ca9fe7..4ddf48969f 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/systemd/generate/common_test.go b/pkg/systemd/generate/common_test.go index cb513430d2..92fb9c0fb8 100644 --- a/pkg/systemd/generate/common_test.go +++ b/pkg/systemd/generate/common_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index 1230640f38..821c993df4 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index 6bb9f3ca65..48054ded49 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index cab7587794..3258ef4a1e 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index 7fa802810d..43c655ee0a 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -1,5 +1,4 @@ //go:build !remote -// +build !remote package generate diff --git a/pkg/terminal/console_unix.go b/pkg/terminal/console_unix.go index 53290be249..893111c6cf 100644 --- a/pkg/terminal/console_unix.go +++ b/pkg/terminal/console_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package terminal diff --git a/pkg/terminal/console_windows.go b/pkg/terminal/console_windows.go index 1a7da33351..b352de5029 100644 --- a/pkg/terminal/console_windows.go +++ b/pkg/terminal/console_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package terminal diff --git a/pkg/util/mountOpts_other.go b/pkg/util/mountOpts_other.go index 64b4dd1d94..7a3c3c3821 100644 --- a/pkg/util/mountOpts_other.go +++ b/pkg/util/mountOpts_other.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package util diff --git a/pkg/util/utils_darwin.go b/pkg/util/utils_darwin.go index 3a2e587dfe..adefa703cf 100644 --- a/pkg/util/utils_darwin.go +++ b/pkg/util/utils_darwin.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package util diff --git a/pkg/util/utils_freebsd.go b/pkg/util/utils_freebsd.go index 621bb436ee..3da132821e 100644 --- a/pkg/util/utils_freebsd.go +++ b/pkg/util/utils_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package util diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 58ac795a1f..afa2d4f840 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/pkg/util/utils_unsupported.go b/pkg/util/utils_unsupported.go index 26fb7adf92..8a77e189da 100644 --- a/pkg/util/utils_unsupported.go +++ b/pkg/util/utils_unsupported.go @@ -1,5 +1,4 @@ //go:build darwin || windows || freebsd -// +build darwin windows freebsd package util diff --git a/pkg/util/utils_windows.go b/pkg/util/utils_windows.go index 3d403e3f47..0fbe9c2608 100644 --- a/pkg/util/utils_windows.go +++ b/pkg/util/utils_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package util diff --git a/test/checkseccomp/checkseccomp.go b/test/checkseccomp/checkseccomp.go index 6c188ec0d5..2cfd134865 100644 --- a/test/checkseccomp/checkseccomp.go +++ b/test/checkseccomp/checkseccomp.go @@ -1,5 +1,4 @@ //go:build seccomp -// +build seccomp package main diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index ae7d97c059..6d5cdc08ff 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -1,5 +1,4 @@ //go:build remote_testing -// +build remote_testing package integration diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 8a44d5c7da..2e99206ebb 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -1,5 +1,4 @@ //go:build !remote_testing -// +build !remote_testing package integration diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index fbd9f799b2..c79ef3a488 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -1,5 +1,4 @@ //go:build !remote_testing -// +build !remote_testing // build for play kube is not supported on remote yet. diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 274f8bfcce..00046c1a86 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -1,5 +1,4 @@ //go:build !remote_testing -// +build !remote_testing package integration diff --git a/test/tools/tools.go b/test/tools/tools.go index dfbcb0437b..ec18322719 100644 --- a/test/tools/tools.go +++ b/test/tools/tools.go @@ -1,5 +1,4 @@ //go:build tools -// +build tools package tools