containers · openshift-merge-bot · Jan 4, 2024 · Jan 3, 2024
diff --git a/cmd/seccomp/generate.go b/cmd/seccomp/generate.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/libimage/copier.go b/libimage/copier.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/corrupted_test.go b/libimage/corrupted_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/disk_usage.go b/libimage/disk_usage.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/events.go b/libimage/events.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/filters.go b/libimage/filters.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/filters_test.go b/libimage/filters_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/history.go b/libimage/history.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/history_test.go b/libimage/history_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/image.go b/libimage/image.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/image_config.go b/libimage/image_config.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/image_test.go b/libimage/image_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/image_tree.go b/libimage/image_tree.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/import.go b/libimage/import.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/import_test.go b/libimage/import_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/inspect.go b/libimage/inspect.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/layer_tree.go b/libimage/layer_tree.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/load.go b/libimage/load.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/load_test.go b/libimage/load_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/manifest_list.go b/libimage/manifest_list.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/manifest_list_test.go b/libimage/manifest_list_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/normalize.go b/libimage/normalize.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/normalize_test.go b/libimage/normalize_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/oci.go b/libimage/oci.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/platform.go b/libimage/platform.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/pull.go b/libimage/pull.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/pull_test.go b/libimage/pull_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/push.go b/libimage/push.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/push_test.go b/libimage/push_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/remove_test.go b/libimage/remove_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/runtime.go b/libimage/runtime.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/runtime_test.go b/libimage/runtime_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/save.go b/libimage/save.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/save_test.go b/libimage/save_test.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libimage/search.go b/libimage/search.go
@@ -1,5 +1,4 @@
 //go:build !remote
-// +build !remote
 
 package libimage
 

diff --git a/libnetwork/cni/cni_conversion.go b/libnetwork/cni/cni_conversion.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package cni
 

diff --git a/libnetwork/cni/cni_exec.go b/libnetwork/cni/cni_exec.go
@@ -17,7 +17,6 @@
 // limitations under the License.
 
 //go:build linux || freebsd
-// +build linux freebsd
 
 package cni
 

diff --git a/libnetwork/cni/cni_suite_test.go b/libnetwork/cni/cni_suite_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cni_test
 

diff --git a/libnetwork/cni/cni_types.go b/libnetwork/cni/cni_types.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package cni
 

diff --git a/libnetwork/cni/config.go b/libnetwork/cni/config.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package cni
 

diff --git a/libnetwork/cni/config_freebsd.go b/libnetwork/cni/config_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package cni
 

diff --git a/libnetwork/cni/config_linux.go b/libnetwork/cni/config_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cni
 

diff --git a/libnetwork/cni/config_test.go b/libnetwork/cni/config_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cni_test
 

diff --git a/libnetwork/cni/network.go b/libnetwork/cni/network.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package cni
 

diff --git a/libnetwork/cni/run.go b/libnetwork/cni/run.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package cni
 

diff --git a/libnetwork/cni/run_test.go b/libnetwork/cni/run_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cni_test
 

diff --git a/libnetwork/netavark/config.go b/libnetwork/netavark/config.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package netavark
 

diff --git a/libnetwork/netavark/config_test.go b/libnetwork/netavark/config_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netavark_test
 

diff --git a/libnetwork/netavark/const.go b/libnetwork/netavark/const.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package netavark
 

diff --git a/libnetwork/netavark/exec.go b/libnetwork/netavark/exec.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package netavark
 

diff --git a/libnetwork/netavark/ipam.go b/libnetwork/netavark/ipam.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package netavark
 

diff --git a/libnetwork/netavark/ipam_test.go b/libnetwork/netavark/ipam_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netavark
 

diff --git a/libnetwork/netavark/netavark_suite_test.go b/libnetwork/netavark/netavark_suite_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netavark_test
 

diff --git a/libnetwork/netavark/network.go b/libnetwork/netavark/network.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package netavark
 

diff --git a/libnetwork/netavark/plugin_test.go b/libnetwork/netavark/plugin_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netavark_test
 

diff --git a/libnetwork/netavark/run.go b/libnetwork/netavark/run.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package netavark
 

diff --git a/libnetwork/netavark/run_test.go b/libnetwork/netavark/run_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netavark_test
 

diff --git a/libnetwork/network/interface.go b/libnetwork/network/interface.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package network
 

diff --git a/libnetwork/slirp4netns/slirp4netns.go b/libnetwork/slirp4netns/slirp4netns.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package slirp4netns
 

diff --git a/pkg/apparmor/apparmor_linux.go b/pkg/apparmor/apparmor_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && apparmor
-// +build linux,apparmor
 
 package apparmor
 

diff --git a/pkg/apparmor/apparmor_linux_template.go b/pkg/apparmor/apparmor_linux_template.go
@@ -1,5 +1,4 @@
 //go:build linux && apparmor
-// +build linux,apparmor
 
 package apparmor
 

diff --git a/pkg/apparmor/apparmor_linux_test.go b/pkg/apparmor/apparmor_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux && apparmor
-// +build linux,apparmor
 
 package apparmor
 

diff --git a/pkg/apparmor/apparmor_unsupported.go b/pkg/apparmor/apparmor_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux || !apparmor
-// +build !linux !apparmor
 
 package apparmor
 

diff --git a/pkg/cgroups/blkio_linux.go b/pkg/cgroups/blkio_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/pkg/cgroups/cgroups_linux.go b/pkg/cgroups/cgroups_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cgroups
 

diff --git a/pkg/cgroups/cgroups_linux_test.go b/pkg/cgroups/cgroups_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cgroups