From c14213399a2fc5cde974d477995cc13e1fb893c8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 29 Jun 2024 15:44:42 +0200 Subject: [PATCH] remove pre-go1.17 build-tags Removed pre-go1.17 build-tags with go fix; go fix -mod=readonly ./... Signed-off-by: Sebastiaan van Stijn --- contrib/cmd/seccompagent/seccompagent.go | 1 - contrib/cmd/seccompagent/unsupported.go | 1 - libcontainer/apparmor/apparmor_unsupported.go | 1 - libcontainer/capabilities/capabilities.go | 1 - libcontainer/capabilities/capabilities_unsupported.go | 1 - libcontainer/configs/cgroup_unsupported.go | 1 - libcontainer/configs/configs_fuzzer.go | 1 - libcontainer/configs/mount_unsupported.go | 1 - libcontainer/configs/namespaces_syscall.go | 1 - libcontainer/configs/namespaces_syscall_unsupported.go | 1 - libcontainer/configs/namespaces_unsupported.go | 1 - libcontainer/devices/device_unix.go | 1 - libcontainer/devices/device_unix_test.go | 1 - libcontainer/dmz/dmz_linux.go | 1 - libcontainer/dmz/dmz_unsupported.go | 1 - libcontainer/integration/seccomp_test.go | 1 - libcontainer/nsenter/nsenter.go | 1 - libcontainer/nsenter/nsenter_gccgo.go | 1 - libcontainer/seccomp/patchbpf/enosys_linux.go | 1 - libcontainer/seccomp/patchbpf/enosys_linux_test.go | 1 - libcontainer/seccomp/patchbpf/enosys_unsupported.go | 1 - libcontainer/seccomp/seccomp_linux.go | 1 - libcontainer/seccomp/seccomp_unsupported.go | 1 - libcontainer/system/linux.go | 1 - libcontainer/userns/userns_fuzzer.go | 1 - libcontainer/userns/userns_unsupported.go | 1 - libcontainer/utils/utils_unix.go | 1 - 27 files changed, 27 deletions(-) diff --git a/contrib/cmd/seccompagent/seccompagent.go b/contrib/cmd/seccompagent/seccompagent.go index 9a6abc8f0..be1e6c255 100644 --- a/contrib/cmd/seccompagent/seccompagent.go +++ b/contrib/cmd/seccompagent/seccompagent.go @@ -1,5 +1,4 @@ //go:build linux && seccomp -// +build linux,seccomp package main diff --git a/contrib/cmd/seccompagent/unsupported.go b/contrib/cmd/seccompagent/unsupported.go index 773eeaf65..3463d4e0b 100644 --- a/contrib/cmd/seccompagent/unsupported.go +++ b/contrib/cmd/seccompagent/unsupported.go @@ -1,5 +1,4 @@ //go:build !linux || !seccomp -// +build !linux !seccomp package main diff --git a/libcontainer/apparmor/apparmor_unsupported.go b/libcontainer/apparmor/apparmor_unsupported.go index 684248f25..4484cd239 100644 --- a/libcontainer/apparmor/apparmor_unsupported.go +++ b/libcontainer/apparmor/apparmor_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package apparmor diff --git a/libcontainer/capabilities/capabilities.go b/libcontainer/capabilities/capabilities.go index d38b8a7cd..69884ef99 100644 --- a/libcontainer/capabilities/capabilities.go +++ b/libcontainer/capabilities/capabilities.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package capabilities diff --git a/libcontainer/capabilities/capabilities_unsupported.go b/libcontainer/capabilities/capabilities_unsupported.go index 0eafa4f2c..d7b5ce960 100644 --- a/libcontainer/capabilities/capabilities_unsupported.go +++ b/libcontainer/capabilities/capabilities_unsupported.go @@ -1,4 +1,3 @@ //go:build !linux -// +build !linux package capabilities diff --git a/libcontainer/configs/cgroup_unsupported.go b/libcontainer/configs/cgroup_unsupported.go index 7e383020f..53f5ec5a0 100644 --- a/libcontainer/configs/cgroup_unsupported.go +++ b/libcontainer/configs/cgroup_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package configs diff --git a/libcontainer/configs/configs_fuzzer.go b/libcontainer/configs/configs_fuzzer.go index bce829e29..1fd87ce6a 100644 --- a/libcontainer/configs/configs_fuzzer.go +++ b/libcontainer/configs/configs_fuzzer.go @@ -1,5 +1,4 @@ //go:build gofuzz -// +build gofuzz package configs diff --git a/libcontainer/configs/mount_unsupported.go b/libcontainer/configs/mount_unsupported.go index 215419121..1d4d9fe52 100644 --- a/libcontainer/configs/mount_unsupported.go +++ b/libcontainer/configs/mount_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package configs diff --git a/libcontainer/configs/namespaces_syscall.go b/libcontainer/configs/namespaces_syscall.go index 15d8046f3..26b70b26f 100644 --- a/libcontainer/configs/namespaces_syscall.go +++ b/libcontainer/configs/namespaces_syscall.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package configs diff --git a/libcontainer/configs/namespaces_syscall_unsupported.go b/libcontainer/configs/namespaces_syscall_unsupported.go index fbb0d4907..10bf24365 100644 --- a/libcontainer/configs/namespaces_syscall_unsupported.go +++ b/libcontainer/configs/namespaces_syscall_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux && !windows -// +build !linux,!windows package configs diff --git a/libcontainer/configs/namespaces_unsupported.go b/libcontainer/configs/namespaces_unsupported.go index 946db30a5..914684993 100644 --- a/libcontainer/configs/namespaces_unsupported.go +++ b/libcontainer/configs/namespaces_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package configs diff --git a/libcontainer/devices/device_unix.go b/libcontainer/devices/device_unix.go index 7d8e9fc31..d00775f51 100644 --- a/libcontainer/devices/device_unix.go +++ b/libcontainer/devices/device_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package devices diff --git a/libcontainer/devices/device_unix_test.go b/libcontainer/devices/device_unix_test.go index 9d6fb5c2e..2e00847ac 100644 --- a/libcontainer/devices/device_unix_test.go +++ b/libcontainer/devices/device_unix_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package devices diff --git a/libcontainer/dmz/dmz_linux.go b/libcontainer/dmz/dmz_linux.go index eddbbc701..29f2af08e 100644 --- a/libcontainer/dmz/dmz_linux.go +++ b/libcontainer/dmz/dmz_linux.go @@ -1,5 +1,4 @@ //go:build !runc_nodmz -// +build !runc_nodmz package dmz diff --git a/libcontainer/dmz/dmz_unsupported.go b/libcontainer/dmz/dmz_unsupported.go index 2ba672704..9e284f653 100644 --- a/libcontainer/dmz/dmz_unsupported.go +++ b/libcontainer/dmz/dmz_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux || runc_nodmz -// +build !linux runc_nodmz package dmz diff --git a/libcontainer/integration/seccomp_test.go b/libcontainer/integration/seccomp_test.go index ecdfa7957..465dbaefc 100644 --- a/libcontainer/integration/seccomp_test.go +++ b/libcontainer/integration/seccomp_test.go @@ -1,5 +1,4 @@ //go:build linux && cgo && seccomp -// +build linux,cgo,seccomp package integration diff --git a/libcontainer/nsenter/nsenter.go b/libcontainer/nsenter/nsenter.go index 2d1f3e11c..f767864c3 100644 --- a/libcontainer/nsenter/nsenter.go +++ b/libcontainer/nsenter/nsenter.go @@ -1,5 +1,4 @@ //go:build linux && !gccgo -// +build linux,!gccgo package nsenter diff --git a/libcontainer/nsenter/nsenter_gccgo.go b/libcontainer/nsenter/nsenter_gccgo.go index 86bad539e..1dcde2ea8 100644 --- a/libcontainer/nsenter/nsenter_gccgo.go +++ b/libcontainer/nsenter/nsenter_gccgo.go @@ -1,5 +1,4 @@ //go:build linux && gccgo -// +build linux,gccgo package nsenter diff --git a/libcontainer/seccomp/patchbpf/enosys_linux.go b/libcontainer/seccomp/patchbpf/enosys_linux.go index 6ee4f1d53..f0bf186ee 100644 --- a/libcontainer/seccomp/patchbpf/enosys_linux.go +++ b/libcontainer/seccomp/patchbpf/enosys_linux.go @@ -1,5 +1,4 @@ //go:build cgo && seccomp -// +build cgo,seccomp package patchbpf diff --git a/libcontainer/seccomp/patchbpf/enosys_linux_test.go b/libcontainer/seccomp/patchbpf/enosys_linux_test.go index 6ca2c0616..cb8458929 100644 --- a/libcontainer/seccomp/patchbpf/enosys_linux_test.go +++ b/libcontainer/seccomp/patchbpf/enosys_linux_test.go @@ -1,5 +1,4 @@ //go:build cgo && seccomp -// +build cgo,seccomp package patchbpf diff --git a/libcontainer/seccomp/patchbpf/enosys_unsupported.go b/libcontainer/seccomp/patchbpf/enosys_unsupported.go index d23167ae3..2812ca461 100644 --- a/libcontainer/seccomp/patchbpf/enosys_unsupported.go +++ b/libcontainer/seccomp/patchbpf/enosys_unsupported.go @@ -1,4 +1,3 @@ //go:build !linux || !cgo || !seccomp -// +build !linux !cgo !seccomp package patchbpf diff --git a/libcontainer/seccomp/seccomp_linux.go b/libcontainer/seccomp/seccomp_linux.go index 2c64ebbba..2f646b6d8 100644 --- a/libcontainer/seccomp/seccomp_linux.go +++ b/libcontainer/seccomp/seccomp_linux.go @@ -1,5 +1,4 @@ //go:build cgo && seccomp -// +build cgo,seccomp package seccomp diff --git a/libcontainer/seccomp/seccomp_unsupported.go b/libcontainer/seccomp/seccomp_unsupported.go index b08a34986..d2222ce71 100644 --- a/libcontainer/seccomp/seccomp_unsupported.go +++ b/libcontainer/seccomp/seccomp_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux || !cgo || !seccomp -// +build !linux !cgo !seccomp package seccomp diff --git a/libcontainer/system/linux.go b/libcontainer/system/linux.go index 368364baf..7bbf92a3d 100644 --- a/libcontainer/system/linux.go +++ b/libcontainer/system/linux.go @@ -1,5 +1,4 @@ //go:build linux -// +build linux package system diff --git a/libcontainer/userns/userns_fuzzer.go b/libcontainer/userns/userns_fuzzer.go index bff03f8d8..d90cffcf4 100644 --- a/libcontainer/userns/userns_fuzzer.go +++ b/libcontainer/userns/userns_fuzzer.go @@ -1,5 +1,4 @@ //go:build gofuzz -// +build gofuzz package userns diff --git a/libcontainer/userns/userns_unsupported.go b/libcontainer/userns/userns_unsupported.go index 391c811c6..71d4c6353 100644 --- a/libcontainer/userns/userns_unsupported.go +++ b/libcontainer/userns/userns_unsupported.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package userns diff --git a/libcontainer/utils/utils_unix.go b/libcontainer/utils/utils_unix.go index f57f0874a..7b0acfa83 100644 --- a/libcontainer/utils/utils_unix.go +++ b/libcontainer/utils/utils_unix.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package utils