diff --git a/add_common.go b/add_common.go index b1eef2c19..ddcc9d285 100644 --- a/add_common.go +++ b/add_common.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package buildah diff --git a/bind/mount.go b/bind/mount.go index 0524eca83..5f2929219 100644 --- a/bind/mount.go +++ b/bind/mount.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package bind diff --git a/bind/mount_unsupported.go b/bind/mount_unsupported.go index 88ca2ca8b..11cee0a47 100644 --- a/bind/mount_unsupported.go +++ b/bind/mount_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux +//go:build !linux package bind diff --git a/chroot/pty_posix.go b/chroot/pty_posix.go index 97c1b6589..827ed9747 100644 --- a/chroot/pty_posix.go +++ b/chroot/pty_posix.go @@ -1,5 +1,4 @@ //go:build freebsd && cgo -// +build freebsd,cgo package chroot diff --git a/chroot/pty_ptmx.go b/chroot/pty_ptmx.go index b1ba96bc9..d2090911b 100644 --- a/chroot/pty_ptmx.go +++ b/chroot/pty_ptmx.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package chroot diff --git a/chroot/pty_unsupported.go b/chroot/pty_unsupported.go index 55ea597e3..5b6a67d58 100644 --- a/chroot/pty_unsupported.go +++ b/chroot/pty_unsupported.go @@ -1,6 +1,4 @@ //go:build !linux && !(freebsd && cgo) -// +build !linux -// +build !freebsd !cgo package chroot diff --git a/chroot/run_common.go b/chroot/run_common.go index 4ffe1382d..a2e43618c 100644 --- a/chroot/run_common.go +++ b/chroot/run_common.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package chroot diff --git a/chroot/run_freebsd.go b/chroot/run_freebsd.go index 535491d6a..d6d5b2a6a 100644 --- a/chroot/run_freebsd.go +++ b/chroot/run_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package chroot diff --git a/chroot/run_linux.go b/chroot/run_linux.go index 64d60e81f..38ffe0426 100644 --- a/chroot/run_linux.go +++ b/chroot/run_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package chroot diff --git a/chroot/run_test.go b/chroot/run_test.go index 6195d34e0..1b67a6df2 100644 --- a/chroot/run_test.go +++ b/chroot/run_test.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package chroot diff --git a/chroot/seccomp.go b/chroot/seccomp.go index e875f330c..25e218ecf 100644 --- a/chroot/seccomp.go +++ b/chroot/seccomp.go @@ -1,5 +1,4 @@ //go:build linux && seccomp -// +build linux,seccomp package chroot diff --git a/chroot/seccomp_freebsd.go b/chroot/seccomp_freebsd.go index 90e9f14cb..134a5c4aa 100644 --- a/chroot/seccomp_freebsd.go +++ b/chroot/seccomp_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd && seccomp -// +build freebsd,seccomp package chroot diff --git a/chroot/seccomp_unsupported.go b/chroot/seccomp_unsupported.go index dc80dcd1d..951b1b6d8 100644 --- a/chroot/seccomp_unsupported.go +++ b/chroot/seccomp_unsupported.go @@ -1,5 +1,4 @@ //go:build (!linux && !freebsd) || !seccomp -// +build !linux,!freebsd !seccomp package chroot diff --git a/chroot/selinux.go b/chroot/selinux.go index bba4b8254..c0203a36a 100644 --- a/chroot/selinux.go +++ b/chroot/selinux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package chroot diff --git a/chroot/selinux_unsupported.go b/chroot/selinux_unsupported.go index 826b920e7..ae9ac8962 100644 --- a/chroot/selinux_unsupported.go +++ b/chroot/selinux_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd -// +build !linux,!freebsd package chroot diff --git a/chroot/unsupported.go b/chroot/unsupported.go index 677a0a2df..a2e7f45be 100644 --- a/chroot/unsupported.go +++ b/chroot/unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd -// +build !linux,!freebsd package chroot diff --git a/cmd/buildah/unshare.go b/cmd/buildah/unshare.go index d45498db4..afd4fe3b0 100644 --- a/cmd/buildah/unshare.go +++ b/cmd/buildah/unshare.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package main diff --git a/cmd/buildah/unshare_unsupported.go b/cmd/buildah/unshare_unsupported.go index cfd666bc4..f8131c90a 100644 --- a/cmd/buildah/unshare_unsupported.go +++ b/cmd/buildah/unshare_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package main diff --git a/copier/copier_unix_test.go b/copier/copier_unix_test.go index fb9888bd5..36df1db7d 100644 --- a/copier/copier_unix_test.go +++ b/copier/copier_unix_test.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package copier diff --git a/copier/hardlink_not_uint64.go b/copier/hardlink_not_uint64.go index 062f489f2..cee34aca7 100644 --- a/copier/hardlink_not_uint64.go +++ b/copier/hardlink_not_uint64.go @@ -1,5 +1,4 @@ //go:build darwin || (linux && mips) || (linux && mipsle) || (linux && mips64) || (linux && mips64le) -// +build darwin linux,mips linux,mipsle linux,mips64 linux,mips64le package copier diff --git a/copier/hardlink_uint64.go b/copier/hardlink_uint64.go index 37365ef05..e88e1899d 100644 --- a/copier/hardlink_uint64.go +++ b/copier/hardlink_uint64.go @@ -1,5 +1,4 @@ //go:build (linux && !mips && !mipsle && !mips64 && !mips64le) || freebsd || netbsd -// +build linux,!mips,!mipsle,!mips64,!mips64le freebsd netbsd package copier diff --git a/copier/hardlink_unix.go b/copier/hardlink_unix.go index 67eebc0e2..526ebd83f 100644 --- a/copier/hardlink_unix.go +++ b/copier/hardlink_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package copier diff --git a/copier/hardlink_windows.go b/copier/hardlink_windows.go index ec71ccea4..dacb44906 100644 --- a/copier/hardlink_windows.go +++ b/copier/hardlink_windows.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin package copier diff --git a/copier/mknod_int.go b/copier/mknod_int.go index b9e9f6fef..e23e71713 100644 --- a/copier/mknod_int.go +++ b/copier/mknod_int.go @@ -1,5 +1,4 @@ //go:build !windows && !freebsd -// +build !windows,!freebsd package copier diff --git a/copier/mknod_uint64.go b/copier/mknod_uint64.go index ccddf36fb..10bc4c2eb 100644 --- a/copier/mknod_uint64.go +++ b/copier/mknod_uint64.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package copier diff --git a/copier/syscall_unix.go b/copier/syscall_unix.go index d4650e9c2..30356caa2 100644 --- a/copier/syscall_unix.go +++ b/copier/syscall_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package copier diff --git a/copier/syscall_windows.go b/copier/syscall_windows.go index 3a88d2d3e..657b3004e 100644 --- a/copier/syscall_windows.go +++ b/copier/syscall_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package copier diff --git a/copier/xattrs.go b/copier/xattrs.go index f5b2e731f..986156d2f 100644 --- a/copier/xattrs.go +++ b/copier/xattrs.go @@ -1,5 +1,4 @@ //go:build linux || netbsd || freebsd || darwin -// +build linux netbsd freebsd darwin package copier diff --git a/copier/xattrs_unsupported.go b/copier/xattrs_unsupported.go index 750d842f8..59444ff61 100644 --- a/copier/xattrs_unsupported.go +++ b/copier/xattrs_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux,!netbsd,!freebsd,!darwin +//go:build !linux && !netbsd && !freebsd && !darwin package copier diff --git a/define/mount_freebsd.go b/define/mount_freebsd.go index ae5ccc5f5..fff40056a 100644 --- a/define/mount_freebsd.go +++ b/define/mount_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package define diff --git a/define/mount_linux.go b/define/mount_linux.go index 9d59cb6c3..1e923a043 100644 --- a/define/mount_linux.go +++ b/define/mount_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package define diff --git a/define/mount_unsupported.go b/define/mount_unsupported.go index 3c93e2ff7..e1ae40122 100644 --- a/define/mount_unsupported.go +++ b/define/mount_unsupported.go @@ -1,5 +1,4 @@ //go:build darwin || windows || netbsd -// +build darwin windows netbsd package define diff --git a/define/types_unix.go b/define/types_unix.go index c57e29d97..20b1a7b2f 100644 --- a/define/types_unix.go +++ b/define/types_unix.go @@ -1,4 +1,4 @@ -// +build darwin linux +//go:build darwin || linux package define diff --git a/define/types_unsupported.go b/define/types_unsupported.go index 64e26d377..7db272041 100644 --- a/define/types_unsupported.go +++ b/define/types_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux,!darwin +//go:build !linux && !darwin package define diff --git a/pkg/chrootuser/user_basic.go b/pkg/chrootuser/user_basic.go index 5655a54db..b97064307 100644 --- a/pkg/chrootuser/user_basic.go +++ b/pkg/chrootuser/user_basic.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd -// +build !linux,!freebsd package chrootuser diff --git a/pkg/chrootuser/user_unix.go b/pkg/chrootuser/user_unix.go index 0ccaf8a68..01b9171b8 100644 --- a/pkg/chrootuser/user_unix.go +++ b/pkg/chrootuser/user_unix.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package chrootuser diff --git a/pkg/overlay/overlay_unsupported.go b/pkg/overlay/overlay_unsupported.go index 538db65e0..de7ce7d2b 100644 --- a/pkg/overlay/overlay_unsupported.go +++ b/pkg/overlay/overlay_unsupported.go @@ -1,5 +1,4 @@ //go:build !freebsd && !linux -// +build !freebsd,!linux package overlay diff --git a/pkg/parse/parse_unix.go b/pkg/parse/parse_unix.go index ebb8ad491..3417cb8c9 100644 --- a/pkg/parse/parse_unix.go +++ b/pkg/parse/parse_unix.go @@ -1,5 +1,4 @@ //go:build linux || darwin -// +build linux darwin package parse diff --git a/pkg/parse/parse_unsupported.go b/pkg/parse/parse_unsupported.go index e3d3a71b8..634220f5e 100644 --- a/pkg/parse/parse_unsupported.go +++ b/pkg/parse/parse_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin package parse diff --git a/pkg/rusage/rusage_unix.go b/pkg/rusage/rusage_unix.go index 317046fc3..71fa60f1a 100644 --- a/pkg/rusage/rusage_unix.go +++ b/pkg/rusage/rusage_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package rusage diff --git a/pkg/rusage/rusage_unsupported.go b/pkg/rusage/rusage_unsupported.go index 54ed77fad..47676dd77 100644 --- a/pkg/rusage/rusage_unsupported.go +++ b/pkg/rusage/rusage_unsupported.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package rusage diff --git a/pkg/util/resource_unix.go b/pkg/util/resource_unix.go index 4f7c08cfc..cc62f860c 100644 --- a/pkg/util/resource_unix.go +++ b/pkg/util/resource_unix.go @@ -1,5 +1,4 @@ //go:build linux || freebsd || darwin -// +build linux freebsd darwin package util diff --git a/pkg/util/version_unix.go b/pkg/util/version_unix.go index 471e10e4a..c8b7002a3 100644 --- a/pkg/util/version_unix.go +++ b/pkg/util/version_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package util diff --git a/run_common.go b/run_common.go index 0076b71eb..592eaacdf 100644 --- a/run_common.go +++ b/run_common.go @@ -1,5 +1,4 @@ //go:build linux || freebsd -// +build linux freebsd package buildah diff --git a/run_freebsd.go b/run_freebsd.go index 341c80c4f..58fc7772b 100644 --- a/run_freebsd.go +++ b/run_freebsd.go @@ -1,5 +1,4 @@ //go:build freebsd -// +build freebsd package buildah diff --git a/run_linux.go b/run_linux.go index d948757b5..828d58b9d 100644 --- a/run_linux.go +++ b/run_linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package buildah diff --git a/run_unix.go b/run_unix.go index 68a3dac24..77ec9ddf9 100644 --- a/run_unix.go +++ b/run_unix.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package buildah diff --git a/run_unsupported.go b/run_unsupported.go index b135be7e5..61c893add 100644 --- a/run_unsupported.go +++ b/run_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin && !freebsd -// +build !linux,!darwin,!freebsd package buildah diff --git a/seccomp.go b/seccomp.go index 3348a3e1d..b48174742 100644 --- a/seccomp.go +++ b/seccomp.go @@ -1,5 +1,4 @@ //go:build seccomp && linux -// +build seccomp,linux package buildah diff --git a/seccomp_unsupported.go b/seccomp_unsupported.go index cba8390c5..3a6801e80 100644 --- a/seccomp_unsupported.go +++ b/seccomp_unsupported.go @@ -1,4 +1,4 @@ -// +build !seccomp !linux +//go:build !seccomp || !linux package buildah diff --git a/selinux.go b/selinux.go index 8cc2bfc62..bd28118c2 100644 --- a/selinux.go +++ b/selinux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package buildah diff --git a/selinux_unsupported.go b/selinux_unsupported.go index 5b1948315..4519935bf 100644 --- a/selinux_unsupported.go +++ b/selinux_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux +//go:build !linux package buildah diff --git a/tests/conformance/selinux.go b/tests/conformance/selinux.go index 712f60652..9c4ac0dbe 100644 --- a/tests/conformance/selinux.go +++ b/tests/conformance/selinux.go @@ -1,4 +1,4 @@ -// +build linux +//go:build linux package conformance diff --git a/tests/conformance/selinux_unsupported.go b/tests/conformance/selinux_unsupported.go index 70ba1472b..9ca4eec0d 100644 --- a/tests/conformance/selinux_unsupported.go +++ b/tests/conformance/selinux_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux +//go:build !linux package conformance diff --git a/util/util_unix.go b/util/util_unix.go index 21c55a3ca..507e4892c 100644 --- a/util/util_unix.go +++ b/util/util_unix.go @@ -1,5 +1,4 @@ //go:build linux || darwin || freebsd || netbsd -// +build linux darwin freebsd netbsd package util diff --git a/util/util_unsupported.go b/util/util_unsupported.go index 05a68f60b..36d0664dd 100644 --- a/util/util_unsupported.go +++ b/util/util_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux +//go:build !linux package util diff --git a/util/util_windows.go b/util/util_windows.go index d11e894e0..0a8fa5946 100644 --- a/util/util_windows.go +++ b/util/util_windows.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin package util