Merge pull request #4329 from thaJeztah/rm_old_buildtags

kolyshkin · web-flow · commit 7bcb61118be9 · 2024-07-01T10:18:11.000-07:00
remove pre-go1.17 build-tags
diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package apparmor
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package utils
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux && seccomp`
`2`		`-// +build linux,seccomp`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux \|\| !seccomp`
`2`		`-// +build !linux !seccomp`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux`
`2`		`-// +build !linux`
`3`	`2`
`4`	`3`	`package apparmor`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux`
`2`		`-// +build linux`
`3`	`2`
`4`	`3`	`package capabilities`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`//go:build !linux`
`2`		`-// +build !linux`
`3`	`2`
`4`	`3`	`package capabilities`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build gofuzz`
`2`		`-// +build gofuzz`
`3`	`2`
`4`	`3`	`package configs`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux && !windows`
`2`		`-// +build !linux,!windows`
`3`	`2`
`4`	`3`	`package configs`
`5`	`4`