*: fix build tags

This change is generated by `go1.23rc2 fix ./...`. Had to use go1.23rc2, since all released go versions have a bug preventing it from working with `go 1.22.0` in go.mod (opened golang/go#68825, golang/go#68824 for awareness). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin · Aug 10, 2024 · 24da188 · 24da188
1 parent 94aa41b
commit 24da188
Show file tree

Hide file tree

Showing 57 changed files with 11 additions and 58 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package bind
 

diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package chroot
 

diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package chroot
 

diff --git 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
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package chroot
 

diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package chroot
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package copier
 

diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package copier
 

diff --git 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
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package copier
 

diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package define
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package util
 

diff --git 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
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package buildah
 

diff --git 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
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package buildah
 

diff --git 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
@@ -1,5 +1,4 @@
 //go:build seccomp && linux
-// +build seccomp,linux
 
 package buildah
 

diff --git 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
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package buildah
 

diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-// +build !linux
+//go:build !linux
 
 package conformance
 

diff --git 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
@@ -1,4 +1,4 @@
-// +build !linux
+//go:build !linux
 
 package util
 

diff --git a/util/util_windows.go b/util/util_windows.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin
-// +build !linux,!darwin
 
 package util